From 7a73da6d05b37a4fa1610dbab402e290b7f243de Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 27 Dec 2023 09:43:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8C=85?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/package/packageDetailPopup.vue | 93 +++++++++++---------- pages/package/record/splitPackageRecord.vue | 3 + 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/mycomponents/package/packageDetailPopup.vue b/mycomponents/package/packageDetailPopup.vue index 8d628c99..c9db2247 100644 --- a/mycomponents/package/packageDetailPopup.vue +++ b/mycomponents/package/packageDetailPopup.vue @@ -7,7 +7,8 @@ {{item.item_title}} - {{item.text_wrap}} + {{item.content}} + {{formatDate(item.content)}} @@ -23,6 +24,7 @@ diff --git a/pages/package/record/splitPackageRecord.vue b/pages/package/record/splitPackageRecord.vue index 3d17eeaf..6d0081c5 100644 --- a/pages/package/record/splitPackageRecord.vue +++ b/pages/package/record/splitPackageRecord.vue @@ -295,7 +295,10 @@ subItem.fromInventoryStatus = subItem.inventoryStatus; subItem.toInventoryStatus = subItem.inventoryStatus; + subItem.fromQty = subItem.qty + subItem.toQty = record.qty + subItem.fromPackingNumber = subItem.packingNumber; subItem.toPackingNumber = record.packingNumber; From b5e8ef78f74f5f416821627fe5b0b0da07439f2c Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 27 Dec 2023 10:47:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=92=8C=E5=99=A8=E5=85=B7=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request2.js | 16 +- pages.json | 4 +- .../coms/comPalletRecord.vue | 0 .../record/containerBindRecord.vue} | 4 + .../record/containerUnBindRecord.vue} | 6 +- pages/package/record/overPackageRecord.vue | 266 ++++++++++-------- 6 files changed, 165 insertions(+), 131 deletions(-) rename pages/{pallet => container}/coms/comPalletRecord.vue (100%) rename pages/{pallet/record/bindPalletRecord.vue => container/record/containerBindRecord.vue} (99%) rename pages/{pallet/record/unBindPalletRecord.vue => container/record/containerUnBindRecord.vue} (98%) diff --git a/api/request2.js b/api/request2.js index bb7ec154..9233ed06 100644 --- a/api/request2.js +++ b/api/request2.js @@ -2984,25 +2984,25 @@ export function repleinshRecordSubmit(params) { } /** - * 托盘绑定 提交 + * 器具绑定 提交 * @param {*} params */ -export function bindPalledtRecordSubmit(params) { +export function containerBindRecordSubmit(params) { return request({ - url: baseApi + "/magic-api/pda/job/putaway/jobSubmit", - method: "put", + url: baseApi + "/wms/container-main/containerBind", + method: "post", data: params, }); } /** - * 托盘解绑 提交 + * 器具解绑 提交 * @param {*} params */ -export function unbindPalledtRecordSubmit(params) { +export function containerUnBindRecordSubmit(params) { return request({ - url: baseApi + "/magic-api/pda/job/putaway/jobSubmit", - method: "put", + url: baseApi + "/wms/container-main/containerUnBind", + method: "post", data: params, }); } diff --git a/pages.json b/pages.json index 20fed244..c058f1f2 100644 --- a/pages.json +++ b/pages.json @@ -1668,14 +1668,14 @@ }, { - "path": "pages/pallet/record/bindPalletRecord", + "path": "pages/container/record/containerBindRecord", "style": { "navigationBarTitleText": "器具绑定", "enablePullDownRefresh": false } }, { - "path": "pages/pallet/record/unBindPalletRecord", + "path": "pages/container/record/containerUnBindRecord", "style": { "navigationBarTitleText": "器具解绑", "enablePullDownRefresh": false diff --git a/pages/pallet/coms/comPalletRecord.vue b/pages/container/coms/comPalletRecord.vue similarity index 100% rename from pages/pallet/coms/comPalletRecord.vue rename to pages/container/coms/comPalletRecord.vue diff --git a/pages/pallet/record/bindPalletRecord.vue b/pages/container/record/containerBindRecord.vue similarity index 99% rename from pages/pallet/record/bindPalletRecord.vue rename to pages/container/record/containerBindRecord.vue index 076051be..09510e3d 100644 --- a/pages/pallet/record/bindPalletRecord.vue +++ b/pages/container/record/containerBindRecord.vue @@ -48,6 +48,10 @@ From 2c1ea7b5e75289d2a656cfb20249528c3c57c874 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 27 Dec 2023 14:04:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=BD=AC=E7=A7=BBbusinesstype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/inventoryMove/job/scrapToHoldMoveJob.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/inventoryMove/job/scrapToHoldMoveJob.vue b/pages/inventoryMove/job/scrapToHoldMoveJob.vue index fa89a21f..985e5a58 100644 --- a/pages/inventoryMove/job/scrapToHoldMoveJob.vue +++ b/pages/inventoryMove/job/scrapToHoldMoveJob.vue @@ -1,6 +1,6 @@ From 6c9521ad118238d7f1945d3f663047a0f06d59b5 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 27 Dec 2023 17:22:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=20=E7=9B=98=E7=82=B9=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/count/job/countDetail.vue | 22 ++++++------ pages/inspect/job/inspectResult.vue | 55 +++++++++++++++++++---------- 2 files changed, 48 insertions(+), 29 deletions(-) diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue index a91c833b..375e14b7 100644 --- a/pages/count/job/countDetail.vue +++ b/pages/count/job/countDetail.vue @@ -514,17 +514,17 @@ }); var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - // countJobSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + countJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) }, diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue index 7cb69a90..1aa6c8ef 100644 --- a/pages/inspect/job/inspectResult.vue +++ b/pages/inspect/job/inspectResult.vue @@ -338,7 +338,7 @@ }, commit() { - + if (this.jobContent.failedQty == null) { this.showMessage("请输入不合格数量") return @@ -362,23 +362,41 @@ //不合格数量==0、(全部合格)、明细全部合格 if (failedQty == 0) { if (crackQty == 0) { - //报废数==0，直接提交 - this.jobContent.subList.forEach(res => { - res.handleQty = res.qty - res.failedQty = 0; - res.notPassedQty = res.failedQty; - res.crackQty = 0; - res.goodQty = res.qty; - res.failedReason = ""; - res.photos = "" - res.inspectResult = "" - res.toInventoryStatus = "OK" - res.inspectUser = this.$store.state.user.id - }) - - this.jobContent.nextAction = ""; - this.jobContent.goodQty = this.jobContent.receiveQty - this.submitJob(this.jobContent) + if (this.nextAction == "ALL_NOK") { + this.jobContent.subList.forEach(res => { + res.handleQty = res.qty + res.failedQty = res.qty; + res.notPassedQty = res.failedQty; + res.crackQty = 0; + res.goodQty = 0; + res.failedReason = ""; + res.photos = "" + res.inspectResult = "" + res.toInventoryStatus = "NOK" + res.inspectUser = this.$store.state.user.id + }) + this.jobContent.nextAction = this.nextAction; + this.jobContent.goodQty = 0 + this.submitJob(this.jobContent) + }else { + //报废数==0，直接提交 + this.jobContent.subList.forEach(res => { + res.handleQty = res.qty + res.failedQty = 0; + res.notPassedQty = res.failedQty; + res.crackQty = 0; + res.goodQty = res.qty; + res.failedReason = ""; + res.photos = "" + res.inspectResult = "" + res.toInventoryStatus = "OK" + res.inspectUser = this.$store.state.user.id + }) + + this.jobContent.nextAction = ""; + this.jobContent.goodQty = this.jobContent.receiveQty + this.submitJob(this.jobContent) + } } else { //报废数大于0，进入详情 @@ -399,6 +417,7 @@ this.showMessage("请选择下一步动作") return } + //全不合格 if (this.nextAction == "ALL_NOK") { //提交