From c1e060bce382f87b4deae3dec7b1c9ee7b696264 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 08:49:10 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=BE=BE=E6=98=8EisReturnedQty=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/customerreturnRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 7f785a818..e3f331227 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -164,6 +164,7 @@ export const CustomerreturnRequestMain = useCrudSchemas( key: 'isReturnedQty', // 查询列表中字段 value: 'FALSE', // 指查询具体值 action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 }, { From 0c9ab952a871b03da814db8ecab9ee978aff0b81 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 27 Sep 2024 10:42:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?WMS=20bug=20=EF=BC=9AHL-5912=20=20=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=9A=94=E7=A6=BB=EF=BC=8C=E5=BE=85=E6=A3=80=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=B0=E9=9A=94=E7=A6=BB=E7=8A=B6=E6=80=81=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=88=9B=E5=BB=BA=E4=B8=8D=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moveManage/inventorymove/inventorymoveRequestMain/index.vue | 2 +- .../inventorymove/inventorymoveRequestMainHOLDWIP/index.vue | 2 +- .../inventorymove/inventorymoveRequestMainMOVE/index.vue | 2 +- .../inventorymove/inventorymoveRequestMainOKHOLD/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 9b168764f..a7c5ccbde 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -753,7 +753,7 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ - item.fromInventoryStatus = fromInventoryStatus.value + //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value } if(item.qty == 0){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index fc2c1d1bc..957a0bd01 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -657,7 +657,7 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ - item.fromInventoryStatus = fromInventoryStatus.value + //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value } if(item.qty == 0){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index f52cd62b5..52c164806 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -757,7 +757,7 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ - item.fromInventoryStatus = fromInventoryStatus.value + //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value } if(item.qty == 0){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index a3cfa121a..feceec4e5 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -739,7 +739,7 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ - item.fromInventoryStatus = fromInventoryStatus.value + //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value } if(item.qty == 0){ From 9438c8b77ec2ea86210ac27154e4e687a41894f3 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 10:57:19 +0800 Subject: [PATCH 3/9] =?UTF-8?q?HL-6005=E6=8F=90=E7=A4=BA=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7=E5=8D=A0=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E7=8E=B0=E9=80=89=E6=8B=A9=E5=AE=8C=E6=95=B0=E9=87=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index cff712b57..e25e2f6f2 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -234,6 +234,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => tableData.value = [...res.list] originTableData.value = [...res.list] } + let messageItemCode = [] + tableData.value.forEach(item=>{ + if(item['subReturnedQty']<=0){ + messageItemCode.push(item['itemCode']) + } + }) + if(messageItemCode.length>0){ + message.error(`发货记录单号${val[0]['number']}物料${messageItemCode.join(',')}被占用`) + } }).catch(err => { console.log(err) message.error('错误') @@ -745,11 +754,16 @@ const clearSearchInput = (field)=>{ } //为true表示子表数据中存在数量为0的数据 const inputNumberChange = (field, val,row, index) => { + console.log('inputNumberChange',formRef.value.formRef) if(field=='qty'){ + if(row['subReturnedQty']<=0){ + message.error(`发货记录单号${formRef.value.formRef.formModel['deliverRecordNumber']}物料${row['itemCode']}被占用`) + } if(row['subReturnedQty']!=null&&row['qty']>row['subReturnedQty']){ message.error(`物料${row['itemCode']}最大数量为${row['subReturnedQty']}`) } } + console.log('inputNumberChange',field, val,row, index) } // 主子数据 提交 @@ -760,6 +774,10 @@ const submitForm = async (formType, submitData) => { } let flag = true tableData.value.forEach(item=>{ + if(item['subReturnedQty']<=0){ + flag = false + message.error(`发货记录单号${data['deliverRecordNumber']}物料${item['itemCode']}被占用`) + } if(item['subReturnedQty']!=null&&item['qty']>item['subReturnedQty']){ flag = false message.error(`物料${item['itemCode']}最大数量为${item['subReturnedQty']}`) From ea448563c66c4ba711a092ade306e826d04db3f3 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 11:51:04 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=92=8C=E8=BE=BE=E6=98=8E=E5=95=86?= =?UTF-8?q?=E9=87=8F=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index e25e2f6f2..fe1b05e35 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -234,15 +234,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => tableData.value = [...res.list] originTableData.value = [...res.list] } - let messageItemCode = [] - tableData.value.forEach(item=>{ - if(item['subReturnedQty']<=0){ - messageItemCode.push(item['itemCode']) - } - }) - if(messageItemCode.length>0){ - message.error(`发货记录单号${val[0]['number']}物料${messageItemCode.join(',')}被占用`) - } + }).catch(err => { console.log(err) message.error('错误') From 328b972534563f8c04236907924c0e425554cd61 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 13:13:49 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=9C=AA=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinshRequestMain.data.ts | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index 2a01e2205..2d8b4948c 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -899,19 +899,19 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ isTable:false, isForm: false }, - { - label: '未执行任务数量', - field: 'unexecutedQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - isTableForm:false, - hiddenInMain:true, - }, + // { + // label: '未执行任务数量', + // field: 'unexecutedQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // }, + // isTableForm:false, + // hiddenInMain:true, + // }, { label: '操作', field: 'action', From 952c2c728cd6c5e63d3c30bf78e260d821962fc9 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 14:20:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?HL-6005=E6=8F=90=E7=A4=BA=E6=97=B6=E5=80=99?= =?UTF-8?q?=E5=BA=94=E5=8A=A0=E4=B8=AA=E6=89=B9=E6=AC=A1=EF=BC=8C=E7=8E=B0?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E7=89=A9=E6=96=99=E4=B8=8D=E5=90=8C=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E4=B8=8D=E7=9F=A5=E9=81=93=E5=93=AA=E4=B8=AA?= =?UTF-8?q?=E8=A2=AB=E5=8D=A0=E7=94=A8=20@=E7=8E=8B=E5=AE=87=E9=A3=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index fe1b05e35..13502edaa 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -749,7 +749,7 @@ const inputNumberChange = (field, val,row, index) => { console.log('inputNumberChange',formRef.value.formRef) if(field=='qty'){ if(row['subReturnedQty']<=0){ - message.error(`发货记录单号${formRef.value.formRef.formModel['deliverRecordNumber']}物料${row['itemCode']}被占用`) + message.error(`发货记录单号${formRef.value.formRef.formModel['deliverRecordNumber']}物料${row['itemCode']}批次${row['batch']}被占用`) } if(row['subReturnedQty']!=null&&row['qty']>row['subReturnedQty']){ message.error(`物料${row['itemCode']}最大数量为${row['subReturnedQty']}`) @@ -768,7 +768,7 @@ const submitForm = async (formType, submitData) => { tableData.value.forEach(item=>{ if(item['subReturnedQty']<=0){ flag = false - message.error(`发货记录单号${data['deliverRecordNumber']}物料${item['itemCode']}被占用`) + message.error(`发货记录单号${data['deliverRecordNumber']}物料${item['itemCode']}批次${item['batch']}被占用`) } if(item['subReturnedQty']!=null&&item['qty']>item['subReturnedQty']){ flag = false From 0c8b4f38d1983b93e98157428d5af64322fb01b0 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 14:36:15 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 13502edaa..a59d3eecd 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -782,11 +782,11 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(obj => { if(obj.qty == 0){ message.error(`数量不能为0!`) - flag.value = true + flag = true return; } }) - if(flag.value){ + if(flag){ return } formRef.value.formLoading = true From f51ca44f71ba4496909c614cf2fdf8e1fbb7e5c0 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 14:43:44 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95-=E6=98=8E=E7=BB=86bom=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=8F=82=E6=95=B0masterId=E6=94=B9=E4=B8=BAn?= =?UTF-8?q?umber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRecordMain/index.vue | 2 +- .../productreceiptAssembleRecordMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index b06333e58..758726fc4 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -383,7 +383,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.masterId + number: row.number } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 9a55e91c3..461e4c9fd 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -423,7 +423,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true BomDialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + number: row.number } await getDetailListBom() } From 26df37b7540b2ed39683f3bf99c75a2c5b0f96ec Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 15:04:18 +0800 Subject: [PATCH 9/9] =?UTF-8?q?HL-6005=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=B8=8D=E5=A5=BD=E4=BD=BF=E4=BA=86=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=EF=BC=8C=E4=BF=9D=E5=AD=98=E4=B8=8D?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index a59d3eecd..dfeeb45b7 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -775,20 +775,11 @@ const submitForm = async (formType, submitData) => { message.error(`物料${item['itemCode']}最大数量为${item['subReturnedQty']}`) } }) + if(!flag){ return } data.subList = tableData.value // 拼接子表数据参数 - data.subList.forEach(obj => { - if(obj.qty == 0){ - message.error(`数量不能为0!`) - flag = true - return; - } - }) - if(flag){ - return - } formRef.value.formLoading = true try { if (formType === 'create') {