From 24fe84795c84c8414525c9cf0b6f75f27d34a2a3 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 19 Aug 2024 11:37:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?HL-5339=E6=97=A0=E8=AE=A1=E5=88=92=E5=AE=8C?= =?UTF-8?q?=E5=B7=A5=EF=BC=8C=E8=B6=85=E8=BF=87=E6=8A=A5=E5=B7=A5=E6=95=B0?= =?UTF-8?q?=E8=BF=98=E5=8F=AF=E4=BB=A5=E5=9C=A8=E6=89=AB=E6=8F=8F=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E5=88=B0=E6=8A=A5=E5=B7=A5=E6=95=B0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9B=E8=B6=85=E8=BF=87=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=95=B0=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=AF=E5=86=8D=E6=AC=A1=E6=89=AB=E6=8F=8F=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=9C=A8=E6=89=AB=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/fg/receiptNoPlan.vue | 35 +++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue index 8bb14470..25cb7dcb 100644 --- a/src/pages/fg/receiptNoPlan.vue +++ b/src/pages/fg/receiptNoPlan.vue @@ -395,12 +395,22 @@ calcFgQty() { this.dataContent.handleQty = this.showList.length; - if (this.dataContent.handleQty == this.dataContent.packQty) { - if (this.$refs.scanPopup) { - this.$refs.scanPopup.closeScanPopup(); + if(parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty) <= parseFloat(this.dataContent.packQty)){ + if(parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty)){ + if (this.$refs.scanPopup) { + this.$refs.scanPopup.closeScanPopup(); + } + this.commit() + } + }else{ + if (parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.packQty)) { + if (this.$refs.scanPopup) { + this.$refs.scanPopup.closeScanPopup(); + } + this.commit() } - this.commit() } + }, scanPopupGetFocus() { @@ -416,15 +426,22 @@ getH5BatchPrintingLable( number) { let _this = this batchPrintingLable(number).then(resLable => { - console.log('batchPrintingLable', resLable) const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712` const webData = { token: storage.getStorage(storage.constant.token), asn_number: resLable.data } - uni.navigateTo({ - url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` - }); + + if ( this.scanedQty + this.showList.length == this.dataContent.planQty) { + uni.redirectTo({ + url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` + }); + }else{ + uni.navigateTo({ + url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` + }); + } + }) }, @@ -432,7 +449,7 @@ let _this = this // #ifdef APP if (pointData.length > 0) { - if (this.scanedQty + this.showList.length == this.dataContent.planQty) { + if ( this.scanedQty + this.showList.length == this.dataContent.planQty) { uni.redirectTo({ url: `/pages/point/index?points=${JSON.stringify(pointData)}` }); From d6b0371037e4d69ceeacd9afaa60521f65bf53b8 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 19 Aug 2024 14:14:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?HL-5323PDA=20=E7=9B=B4=E6=8E=A5=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E6=89=AB=E6=8F=8F=E7=9A=84=E4=BA=8B=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BD=99=E9=A2=9D=E4=B8=AD=E7=9A=84=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=9C=A8=E4=B8=8A=E6=9E=B6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/putaway/record/putawayRecord.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index 5fc5f1d9..b1b5c250 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -410,6 +410,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; + submitItem.itemName = item.itemName; // detail.toInventoryStatus = detail.inventoryStatus // detail.toLocationCode = detail.toLocationCode From b6692a83252f7a1c8f8d23ab42f3e31487ccf1e1 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 19 Aug 2024 14:17:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/job/repleinshDetail.vue | 26 +++++++++------------ 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 432f3eb8..80d3bb6d 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -189,10 +189,6 @@ that.jobStatus = res.data.status that.subList = res.data.subList; that.toLocationCode = that.subList[0].toLocationCode - that.subList[0].itemCode ="255.707-01" - that.subList[0].fromLocationCode ="S12-01-1" - that.subList[0].batch ="20240728" - that.jobContent.allowModifyLocation="TRUE" that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.detailSource, that.subList) @@ -340,17 +336,17 @@ return } console.log("提交参数", JSON.stringify(params)); - // repleinshJobSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + repleinshJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) }, setParams() {