From 34c3c785ab61068dbe4c4390a357114c69ad338f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Nov 2024 13:15:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?YT-1303=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=B2=A1=E6=9C=89=E5=B8=A6=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/job/deliverDetailBatch.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue index 942c0226..8e08618b 100644 --- a/src/pages/deliver/job/deliverDetailBatch.vue +++ b/src/pages/deliver/job/deliverDetailBatch.vue @@ -652,6 +652,7 @@ obj1.toInventoryStatus =record.inventoryStatus; obj1.toLocationCode = record.toLocationCode; obj1.supplierCode = record.supplierCode; + obj1.uom = record.uom; obj1.toPackingNumber =''; obj1.packingNumber = '' obj1.fromPackingNumber = ''; @@ -669,6 +670,7 @@ } }) + this.jobContent.subList = subList this.jobContent.createTime = createTime; this.jobContent.creator = creator; From a0ba115964320ecb75d3f59e2af1679849d3f4f6 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Nov 2024 16:08:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?YT-1324=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=90=8E=EF=BC=8CPDA=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=EF=BC=8C=E7=B3=BB=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=9B=B4=E6=98=BE=E7=A4=BA=E6=8F=90=E4=BA=A4=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueDetailBatch.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue index f99df8af..40fa52f0 100644 --- a/src/pages/issue/job/issueDetailBatch.vue +++ b/src/pages/issue/job/issueDetailBatch.vue @@ -523,7 +523,6 @@ } console.log("提交参数", params); - return issueJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { From e95fdcf329205052b50d69c6fa76eed1543de75b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Nov 2024 16:29:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?YT-1327pda=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=8F=AA=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=95=B0=E9=87=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productReceipt/job/productReceiptDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 44636dc0..072486ae 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -319,7 +319,7 @@ updateData() { - // calcHandleQty(this.detailSource); + calcHandleQty(this.detailSource); }, From 5da379ec589e897e1f9961f97b9b72e6cc483249 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 28 Nov 2024 13:51:55 +0800 Subject: [PATCH 4/6] =?UTF-8?q?YT-1333=20=E4=BF=AE=E6=94=B9=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/job/deliverDetailBatch.vue | 39 ++++++++++---------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue index 8e08618b..cef3fe59 100644 --- a/src/pages/deliver/job/deliverDetailBatch.vue +++ b/src/pages/deliver/job/deliverDetailBatch.vue @@ -541,13 +541,12 @@ var taskQty = 0; var totalQty = 0; detail.subList.forEach(item => { - if(item.scaned){ item.taskQty=0 item.totalQty=0 item.taskQty =calc.add(item.taskQty,item.qty) item.totalQty =calc.add(item.totalQty,item.handleQty) if (this.jobContent.allowSmallerQty == "FALSE") { - if(item.handleQty!=item.taskQty){ + if(item.handleQtyitem.balance.qty){ - str2 += `批次【${item.batch}】提交数量【${item.handleQty}】不可以大于库存数量【${item.balance.qty}】` + if(item.balance){ + if(item.handleQty>item.balance.qty){ + str2 += `批次【${item.batch}】提交数量【${item.handleQty}】不可以大于库存数量【${item.balance.qty}】` + } } - } - }) }) @@ -582,19 +581,7 @@ }, submitJob() { - var params = this.setParams() - console.log("提交参数", params); - console.log("提交参数", params.subList); - // const isTrue = params.subList.some(item=>{ - // console.log(item.recordList.some(cur=>cur.scaned)) - // return item.recordList.some(cur=>cur.scaned) == true - // }) - const isTrue = params.subList.some(item=>item.scaned) - if(!isTrue){ - uni.hideLoading() - this.showErrorMessage("请扫描您需要提交的发货任务") - return - } + // return; // if (params.subList.length == 0) { // uni.hideLoading() @@ -612,6 +599,20 @@ return; } } + + var params = this.setParams() + console.log("提交参数", params); + console.log("提交参数", params.subList); + // const isTrue = params.subList.some(item=>{ + // console.log(item.recordList.some(cur=>cur.scaned)) + // return item.recordList.some(cur=>cur.scaned) == true + // }) + const isTrue = params.subList.some(item=>item.scaned) + if(!isTrue){ + uni.hideLoading() + this.showErrorMessage("请扫描您需要提交的发货任务") + return + } deliverJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { From bae9c914e9638d9b7c1f8005d94f5d5a615a7245 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 17:48:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/job/deliverDetailBatch.vue | 56 ++++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue index cef3fe59..b12a32c9 100644 --- a/src/pages/deliver/job/deliverDetailBatch.vue +++ b/src/pages/deliver/job/deliverDetailBatch.vue @@ -538,46 +538,46 @@ let str1 = "" let str2 = "" this.detailSource.forEach(detail => { - var taskQty = 0; - var totalQty = 0; + detail.taskQty = 0; + detail.totalQty = 0; detail.subList.forEach(item => { - item.taskQty=0 - item.totalQty=0 - item.taskQty =calc.add(item.taskQty,item.qty) - item.totalQty =calc.add(item.totalQty,item.handleQty) - if (this.jobContent.allowSmallerQty == "FALSE") { - if(item.handleQtyitem.balance.qty){ - str2 += `批次【${item.batch}】提交数量【${item.handleQty}】不可以大于库存数量【${item.balance.qty}】` - } + item.qty = item.qty || 0 + item.handleQty = item.handleQty || 0 + detail.taskQty =calc.add(detail.taskQty,item.qty) + detail.totalQty =calc.add(detail.totalQty,item.handleQty) + if(item.scaned){ + if(item.handleQty>item.balance.qty){ + str2 += `批次【${item.batch}】提交数量【${item.handleQty}】不可以大于库存数量【${item.balance.qty}】` } + } }) + if(detail.handleQty < detail.taskQty){ + str += `物料号【${detail.itemCode}】数量【${detail.handleQty}】不允许小于任务数量【${detail.taskQty}】\n` + } + if(detail.handleQty > detail.taskQty){ + str1 += `物料号【${detail.itemCode}】数量【${detail.handleQty}】不允许大于任务数量【${detail.taskQty}】\n` + } }) - - if (str) { - str = '不允许提交\n' + str - this.showErrorMessage(str) + if (this.jobContent.allowSmallerQty == "FALSE") { + if (str) { + str = '不允许提交\n' + str + this.showErrorMessage(str) + } } - if (str1) { - str1 = '不允许提交\n' + str1 - this.showErrorMessage(str1) + if (this.allowBiggerQty == 'FALSE') { + if (str1) { + str1 = '不允许提交\n' + str1 + this.showErrorMessage(str1) + } } + if (str2) { str2 = '不允许提交\n' + str2 this.showErrorMessage(str2) } return str || str1 || str2 ? false : true - + }, submitJob() { From 272ce926ca2e5062992b2f3fb937c225ade82463 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 17:58:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?YT-1347pda=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E3=80=81=E8=A1=A5=E7=BB=99=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=EF=BC=8C=E8=BF=9B=E5=85=A5=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=98=BE=E7=A4=BA=E8=A3=85?= =?UTF-8?q?=E9=85=8D=E5=92=8C=E9=A2=84=E7=94=9F=E4=BA=A7=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=B7=E5=8F=A3=E3=80=81=E8=A1=A5=E7=BB=99?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages.json b/src/pages.json index 11059bbf..58834e8d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1272,7 +1272,7 @@ { "path": "pages/productReceipt/job/productReceiptDetail", "style": { - "navigationBarTitleText": "预生产收货详情", + "navigationBarTitleText": "", "enablePullDownRefresh": false } }, @@ -1367,7 +1367,7 @@ { "path": "pages/productReceipt/job/fgProductReceiptJob", "style": { - "navigationBarTitleText": "装配收货任务", + "navigationBarTitleText": "号口品收货任务", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", @@ -1393,14 +1393,14 @@ { "path": "pages/productReceipt/job/fgProductReceiptDetail", "style": { - "navigationBarTitleText": "装配收货详情", + "navigationBarTitleText": "号口品收货详情", "enablePullDownRefresh": false } }, { "path": "pages/productReceipt/job/semiProductReceiptJob", "style": { - "navigationBarTitleText": "预生产收货任务", + "navigationBarTitleText": "补给品收货任务", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", @@ -1426,7 +1426,7 @@ { "path": "pages/productReceipt/job/semiProductReceiptDetail", "style": { - "navigationBarTitleText": "预生产完工收货详情", + "navigationBarTitleText": "补给品收货详情", "enablePullDownRefresh": false } },