From f5e31ee1e5f1163ccfc3ee2d792306f48517a039 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Sun, 18 Aug 2024 17:54:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E5=8F=91?= =?UTF-8?q?=E6=96=99=E6=89=AB=E6=8F=8F=E7=88=B6=E5=AD=90=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/record/directIssue.vue | 79 ++++++++++++++++--- .../record/directRepleinshRecord.vue | 71 +++++++++++++++-- 2 files changed, 132 insertions(+), 18 deletions(-) diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index c65782ef..fe0fb212 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -243,15 +243,74 @@ } }) if (detail == undefined) { - let newDetail = createDetailInfo(balance, pack); - newDetail.parentNumber = pack.parentNumber; - newDetail.packingNumber = pack.number - newDetail.packUnit = pack.packUnit; - newDetail.packQty = pack.packQty; - if (balance.lableQty) { - newDetail.handleQty = balance.lableQty + //如果最开始扫父，在扫子，提示已经扫描父包装 + //如果扫子在扫父，提示扫描的是父包装，是否移除子包装，是移除子包装，显示父包装 + //扫描的是子包装, + if (pack.parentNumber) { + var checkData = item.subList.find(r => { + if (r.packingNumber == pack.parentNumber && + r.batch == balance.batch) { + return r; + } + }) + if (checkData) { + //提示已经扫描 + this.showErrorMessage("箱码[" + pack.number + "]批次[" + balance.batch + + "]的父包装已经扫描") + console.log("父包装已经扫描") + } else { + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } + + } else { + //扫描的是父包装 + var checkData = item.subList.find(r => { + if (r.parentNumber == pack.number && + r.batch == balance.batch) { + return r; + } + }) + if (checkData) { + //是否移除 + this.$refs.comMessage.showQuestionMessage("箱码[" + checkData.parentNumber+"]" + "批次[" + balance + .batch + "]是父包装，是否移除子包装", res => { + if (res) { + item.subList = []; + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } + }) + console.log("扫描的是父包装，是否移除子包装") + } else { + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } + } - item.subList.push(newDetail); + + this.scanPopupGetFocus() } else { if (detail.scaned == true) { @@ -386,11 +445,11 @@ // }, commit() { - if(this.positionInfo=='请选择生产线'||!this.positionInfo){ + if (this.positionInfo == '请选择生产线' || !this.positionInfo) { this.showErrorMessage("请选择生产线") return } - + uni.showLoading({ title: "提交中....", mask: true diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue index b1a0d33d..ad894bc2 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord.vue @@ -267,15 +267,70 @@ } }) if (detail == undefined) { - let newDetail = createDetailInfo(balance, pack); - newDetail.parentNumber = pack.parentNumber; - newDetail.packingNumber = pack.number - newDetail.packUnit = pack.packUnit; - newDetail.packQty = pack.packQty; - if (balance.lableQty) { - newDetail.handleQty = balance.lableQty + //如果最开始扫父，在扫子，提示已经扫描父包装 + //如果扫子在扫父，提示扫描的是父包装，是否移除子包装，是移除子包装，显示父包装 + //扫描的是子包装, + if (pack.parentNumber) { + var checkData = item.subList.find(r => { + if (r.packingNumber == pack.parentNumber && + r.batch == balance.batch) { + return r; + } + }) + if (checkData) { + //提示已经扫描 + this.showErrorMessage("箱码[" + pack.number + "]批次[" + balance.batch + + "]的父包装已经扫描") + console.log("父包装已经扫描") + } else { + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } + } else { + //扫描的是父包装 + var checkData = item.subList.find(r => { + if (r.parentNumber == pack.number && + r.batch == balance.batch) { + return r; + } + }) + if (checkData) { + //是否移除 + this.$refs.comMessage.showQuestionMessage("箱码[" + checkData.parentNumber+"]" + "批次[" + balance + .batch + "]是父包装，是否移除子包装", res => { + if (res) { + item.subList = []; + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } + }) + console.log("扫描的是父包装，是否移除子包装") + } else { + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } } - item.subList.push(newDetail); this.scanPopupGetFocus() } else { if (detail.scaned == true) {