licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: licq:daca9ec9f8921a4101c605d7c399390d9c64ab6b
Branches Tags
licq:main
..
compare: licq:9c4a1f5e3d63027266889d35ab2c93bd30bbb853
Branches Tags
licq:main

No commits in common. "daca9ec9f8921a4101c605d7c399390d9c64ab6b" and "9c4a1f5e3d63027266889d35ab2c93bd30bbb853" have entirely different histories.
daca9ec9f8 ... 9c4a1f5e3d

3 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java
View File

@ -65,7 +65,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
query.selectAll(MaterialPlanBoomDO.class) query.selectAll(MaterialPlanBoomDO.class)
// .select("mat.id as matId","mat.name as matName","mat.code as matCode","mat.spec as matSpec","mat.unit as matUnit","mat.material_type as matType") // .select("mat.id as matId","mat.name as matName","mat.code as matCode","mat.spec as matSpec","mat.unit as matUnit","mat.material_type as matType")
// .select("b.material_name as matName","m.code as matCode","b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo") // .select("b.material_name as matName","m.code as matCode","b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
.select("b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo") .select("b.material_name as matName","b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
.select("bc.`name` as compositionName","b.`composition_id` as compositionId") .select("bc.`name` as compositionName","b.`composition_id` as compositionId")
.select("ma.brief as customerBriefName,ma.project_name as projectName,ma.name as projectSubName,ma.project_id as projectId") .select("ma.brief as customerBriefName,ma.project_name as projectName,ma.name as projectSubName,ma.project_id as projectId")

5
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<el-card class="hl-card"> <el-card class="hl-card">
<template #header> <template #header>
<span>采购订单生成</span> <span>标准件物料需求计划</span>
</template> </template>
<ContentWrap class="borderxx"> <ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
@ -205,9 +205,7 @@ const exportLoading = ref(false) // 导出的加载中
const getList = async () => { const getList = async () => {
loading.value = true loading.value = true
try { try {
multipleTable.value.clearSelection();
const data = await purchaseOrderMakeDetailApi.page(queryParams) const data = await purchaseOrderMakeDetailApi.page(queryParams)
list.value = data.list list.value = data.list
for (const row of list.value ) { for (const row of list.value ) {
// 如果boomCode不为空，则调用remoteMethod进行查询 // 如果boomCode不为空，则调用remoteMethod进行查询
@ -322,7 +320,6 @@ const serachLog = (row) => {
const handleQuery = () => { const handleQuery = () => {
queryParams.pageNo = 1 queryParams.pageNo = 1
getList() getList()
} }
const opearteForm = async(type) =>{ const opearteForm = async(type) =>{
loading.value = true; loading.value = true;

1
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue
View File

@ -220,7 +220,6 @@ const exportLoading = ref(false) // 导出的加载中
const getList = async () => { const getList = async () => {
loading.value = true loading.value = true
try { try {
multipleTable.value.clearSelection();
const data = await materialPlanBoomApi.getStandardBuyPage(queryParams) const data = await materialPlanBoomApi.getStandardBuyPage(queryParams)
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total