From 35d86a215eaa7ce5e25050a32f6267b4a3c2067c Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 15 Nov 2024 11:00:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=8F=91=E6=96=99=E6=8C=89=E6=89=B9=E6=AC=A1=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/record/directIssueByBatch.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/issue/record/directIssueByBatch.vue b/src/pages/issue/record/directIssueByBatch.vue index d559cf4d..27f1ec27 100644 --- a/src/pages/issue/record/directIssueByBatch.vue +++ b/src/pages/issue/record/directIssueByBatch.vue @@ -81,7 +81,6 @@ createItemInfo, createDetailInfo, calcHandleQty, - createDetailInfoForLabel } from '@/common/record.js'; import { @@ -252,7 +251,7 @@ }) if (item == undefined) { var itemp = createItemInfo(balance, pack); - let newDetail = createDetailInfoForLabel(balance, pack,label); + let newDetail = createDetailInfo(balance, pack,label); itemp.subList.push(newDetail); this.detailSource.push(itemp) } else { @@ -264,7 +263,7 @@ } }) if (detail == undefined) { - let newDetail = createDetailInfoForLabel(balance, pack,label); + let newDetail = createDetailInfo(balance, pack,label); item.subList.push(newDetail); } else { detail.handleQty =calc.add(detail.handleQty, result.label.qty) From 71d5cf7e553615c4b2f45b0d4d468e84824267e2 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 15 Nov 2024 11:13:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?YT-937=20=E8=AF=A6=E6=83=85=E5=BC=B9?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/coms/jobInfoPopup.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/deliver/coms/jobInfoPopup.vue b/src/pages/deliver/coms/jobInfoPopup.vue index f5e5970c..b0c6df5d 100644 --- a/src/pages/deliver/coms/jobInfoPopup.vue +++ b/src/pages/deliver/coms/jobInfoPopup.vue @@ -61,7 +61,9 @@ methods: { openPopup(val) { this.dataContent = val; - this.$refs.popup.open('bottom') + setTimeout(res => { + this.$refs.popup.open('bottom') + }, 500) }, closePopup() { this.$refs.popup.close() From 26099bb9c9b8f66ff2ddbcaa4310d44487d5ed67 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 15 Nov 2024 14:10:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8B=86=E6=A0=87=E7=AD=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/label/record/splitLabel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/label/record/splitLabel.vue b/src/pages/label/record/splitLabel.vue index 143803e2..a014bf2d 100644 --- a/src/pages/label/record/splitLabel.vue +++ b/src/pages/label/record/splitLabel.vue @@ -140,7 +140,7 @@ openScanPopup() { setTimeout(res=>{ if (this.detailSource.length > 0) { - showConfirmMsg("拆包信息还没提交，是否要重新扫描?", res => { + showConfirmMsg("拆标签信息还没提交，是否要重新扫描?", res => { if (res) { this.clearData(); this.$refs.scanPopup.openScanPopup(""); @@ -289,7 +289,7 @@ barcodeBase64: '', }) }) - this.showCommitSuccessMessage("提交成功\n生成拆包记录\n", list) + this.showCommitSuccessMessage("提交成功\n生成拆标签记录\n", list) } else { this.showErrorMessage("提交失败[" + res.msg + "]") From 16366ae9cd82addbc2dc2910c366e1b8200a0239 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 15 Nov 2024 14:34:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?YT-936=20=E4=BF=AE=E6=94=B9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/coms/comDeliverDetailCardBatch.vue | 2 +- src/pages/deliver/job/deliverDetailBatch.vue | 7 ++----- src/pages/issue/coms/comIssueDetailCardBatch.vue | 6 +++--- src/pages/issue/job/issueDetailBatch.vue | 6 +++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/pages/deliver/coms/comDeliverDetailCardBatch.vue b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue index 33de6657..fe39b788 100644 --- a/src/pages/deliver/coms/comDeliverDetailCardBatch.vue +++ b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue @@ -14,7 +14,7 @@ + :right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:detailOptions" @click="itemCoceClick($event,item,index)"> diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue index 24c01ae1..c643e04b 100644 --- a/src/pages/deliver/job/deliverDetailBatch.vue +++ b/src/pages/deliver/job/deliverDetailBatch.vue @@ -28,9 +28,6 @@ - - - @@ -54,7 +51,7 @@ - @@ -315,7 +312,7 @@ toLocationCode:this.toLocationCode, batch:result.label.batch, handleQty:result.label.qty, - qty:this.recommendQty, + qty:0, inventoryStatus:result.balance.inventoryStatus, toLocation:result.balance.toLocation, balance:result.balance, diff --git a/src/pages/issue/coms/comIssueDetailCardBatch.vue b/src/pages/issue/coms/comIssueDetailCardBatch.vue index 2e59bcf8..cd9f8272 100644 --- a/src/pages/issue/coms/comIssueDetailCardBatch.vue +++ b/src/pages/issue/coms/comIssueDetailCardBatch.vue @@ -14,7 +14,7 @@ + :right-options="(item.scaned&&settingParam.allowModifyQty == 'TRUE')?editAndRemoveOptions : item.scaned? removeOptions:[]" @click="itemCoceClick($event,item,index)"> @@ -68,8 +68,8 @@ }, props: { dataContent: { - type: Array, - default: [] + type: Object, + default: {} }, settingParam: { type: Object, diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue index 3b518718..090066d4 100644 --- a/src/pages/issue/job/issueDetailBatch.vue +++ b/src/pages/issue/job/issueDetailBatch.vue @@ -39,10 +39,10 @@ @afterScan='afterScan' :locationCode='fromLocationCode'> --> - - + @@ -347,7 +347,7 @@ toLocationCode:this.toLocationCode, batch:result.label.batch, handleQty:result.label.qty, - qty:this.recommendQty, + qty:0, inventoryStatus:result.balance.inventoryStatus, toLocation:result.balance.toLocation, balance:result.balance, From e0572b20b762926dc4246b4a7e20c9f079e2873c Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 15 Nov 2024 14:36:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?YT-923=20=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=A0=A1=E9=AA=8C=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/customerReturn/job/returnDetail.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue index d06e96be..ac6118dc 100644 --- a/src/pages/customerReturn/job/returnDetail.vue +++ b/src/pages/customerReturn/job/returnDetail.vue @@ -259,8 +259,7 @@ getScanResult(result) { console.log(result) - this.managementType ==result.managementType - if(result.managementType == "BY_BATCH" || result.managementType == "BY_QUANTITY" ){ + if(this.managementType == "BY_BATCH" || this.managementType == "BY_QUANTITY" ){ this.setDataBatch(result) }else{ this.setData(result) @@ -294,6 +293,7 @@ itemDetail.handleQty = Number(result.label.qty) itemDetail.packQty = Number(result.package.packQty) itemDetail.packUnit = result.package.packUnit + itemDetail.balanceQty=result.label.qty this.calcHandleQty(); } @@ -416,6 +416,7 @@ let str = '' let str1 = '' let str2 = '' + let str3 = '' this.detailSource.forEach((item) => { item.subList.forEach(cur => { if (cur.qty != cur.handleQty) { @@ -433,9 +434,13 @@ if(cur.handleQty < cur.qty){ str2 = `批次【${cur.batch}】提交数量【${ cur.handleQty}】不可以小于推荐数量【${cur.qty}】` } + + if(parseFloat(cur.handleQty)>parseFloat(cur.balanceQty)){ + str3 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于库存数量【${cur.qty}】\n` + } }) }) - this.jobContent.allowBiggerQty = 'FALSE' + // this.jobContent.allowBiggerQty = 'FALSE' if(this.jobContent.allowBiggerQty == 'FALSE' &&str1){ this.$refs.comMessage.showConfirmWarningModal(str1) return @@ -444,6 +449,11 @@ this.$refs.comMessage.showConfirmWarningModal(str2) return } + if(str3){ + this.$refs.comMessage.showErrorMessage(str3); + return; + } + if (str) { str = '任务明细未全部完成,是否提交?\n'+str this.$refs.comMessage.showQuestionMessage1(str, 'red', res => { @@ -471,7 +481,7 @@ this.managementList = res.list; var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - + return; customerReturnJobSubmit(params).then(res => { uni.hideLoading() if (res.data) {