From 848ebd3901f4e2a517de9e58cf23706214d744b1 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Thu, 28 Dec 2023 09:47:59 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=80=80=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/productionReturn/job/returnDetail.vue | 29 +++++---------------- static/config.json | 2 +- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue index 46f8d568..9557298b 100644 --- a/pages/productionReturn/job/returnDetail.vue +++ b/pages/productionReturn/job/returnDetail.vue @@ -8,27 +8,9 @@ 申请单号 : {{jobContent.requestNumber}} - - - - 车间 - {{jobContent.workshopCode}} - - - 生产线 - {{titleInfo.productionLineCode}} - - - 工位 - {{ titleInfo.workStationCode }} - - - 原材料库 - {{ titleInfo.toLocationCode}} - - - - + + @@ -103,6 +85,7 @@ import comMessage from '@/mycomponents/common/comMessage.vue' import jobTop from '@/mycomponents/job/jobTop.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue' + import workStation from '@/mycomponents/workStation/workStation.vue' export default { name: 'receipt_detail', @@ -114,8 +97,8 @@ comReturnDetailCard, detailInfoPopup, comMessage, - jobTop - + jobTop, + workStation }, data() { return { diff --git a/static/config.json b/static/config.json index 310a012c..5ff11180 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.176:12080/admin-api", + "value": "http://192.168.0.230:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.176:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", From 0c3cc2e2e8e2d168f07132ffc1b687c167a4cccb Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Thu, 28 Dec 2023 15:17:42 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=92=8C=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/balance/balance.vue | 2 +- mycomponents/record/recordComDetailCard.vue | 4 +- mycomponents/scan/winScanContainer.vue | 2 +- .../container/record/containerBindRecord.vue | 77 ++++++++---------- .../record/containerUnBindRecord.vue | 80 ++++++++++++++++--- pages/purchaseReceipt/job/receiptDetail.vue | 2 - static/config.json | 2 +- 7 files changed, 105 insertions(+), 64 deletions(-) diff --git a/mycomponents/balance/balance.vue b/mycomponents/balance/balance.vue index 39e60f2a..1d9e56ed 100644 --- a/mycomponents/balance/balance.vue +++ b/mycomponents/balance/balance.vue @@ -1,5 +1,5 @@ - + - + diff --git a/mycomponents/scan/winScanContainer.vue b/mycomponents/scan/winScanContainer.vue index b114584d..dd49d475 100644 --- a/mycomponents/scan/winScanContainer.vue +++ b/mycomponents/scan/winScanContainer.vue @@ -78,7 +78,7 @@ uni.hideLoading(); if (res.data.list.length > 0) { this.containerInfo = res.data.list[0]; - if (this.containerInfo.status == 'USED') { + if (this.containerInfo.containerStatus == 'USED') { this.callBack(); } else { this.showErrorMessage("器具[" + this.code + "]状态是[" + this.containerInfo.status + "],不可以绑定") diff --git a/pages/container/record/containerBindRecord.vue b/pages/container/record/containerBindRecord.vue index 09510e3d..9518d90d 100644 --- a/pages/container/record/containerBindRecord.vue +++ b/pages/container/record/containerBindRecord.vue @@ -38,7 +38,7 @@ - @@ -48,7 +48,6 @@ + + diff --git a/pages/container/coms/comPalletRecord.vue b/pages/container/coms/comPalletRecord.vue index 2feaf3cc..2cd70472 100644 --- a/pages/container/coms/comPalletRecord.vue +++ b/pages/container/coms/comPalletRecord.vue @@ -21,7 +21,7 @@ - + @@ -43,7 +43,7 @@ import { getDetailOption, - getDetailEditRemoveOption, + getEditOption, getClearOption } from '@/common/array.js'; export default { @@ -95,7 +95,6 @@ }) } } - }, immediate: true, deep: true @@ -117,7 +116,7 @@ mounted() { this.detailOptions = getDetailOption(); - this.scanOptions = getDetailEditRemoveOption(); + this.scanOptions = getEditOption(); this.removeOptions = getClearOption(); }, diff --git a/pages/container/record/containerBindRecord.vue b/pages/container/record/containerBindRecord.vue index 9518d90d..487c0571 100644 --- a/pages/container/record/containerBindRecord.vue +++ b/pages/container/record/containerBindRecord.vue @@ -1,23 +1,24 @@ diff --git a/pages/container/record/containerUnBindRecord.vue b/pages/container/record/containerUnBindRecord.vue index 3c688c84..d6ec09b2 100644 --- a/pages/container/record/containerUnBindRecord.vue +++ b/pages/container/record/containerUnBindRecord.vue @@ -149,7 +149,7 @@ } else { itemDetail.scaned = true; itemDetail.record = this.createRecordInfo(itemDetail, result.label); - this.calcHandleQty(); + // this.calcHandleQty(); } } } @@ -388,38 +388,5 @@ diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue index de1333e6..36e7b708 100644 --- a/pages/purchaseReturn/job/returnDetail.vue +++ b/pages/purchaseReturn/job/returnDetail.vue @@ -2,9 +2,9 @@ - + - + 发货单：{{jobContent.asnNumber}} @@ -76,7 +76,7 @@ import returnDetailInfoPopup from '@/pages/purchaseReturn/coms/returnDetailInfoPopup.vue' import comMessage from '@/mycomponents/common/comMessage.vue' import jobTop from '@/mycomponents/job/jobTop.vue' - + export default { name: 'returnDetail', components: { @@ -236,7 +236,7 @@ } else { var itemDetail = detail.subList.find(r => { return r.packingNumber == packingNumber && - r.batch == batch + r.batch == batch && r.fromLocationCode == result.fromLocationCode }) if (itemDetail == undefined) { this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中") @@ -247,38 +247,39 @@ let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ - this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + if (this.jobContent.allowModifyInventoryStatus == "TRUE") { + this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + ']不一致,是否继续退货?', res => { if (res) { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty) ; + itemDetail.handleQty = Number(result.balance.qty); itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; - itemDetail.balance.stdPackQty =result.package.stdPackQty - itemDetail.balance.stdPackUnit =result.package.stdPackUnit - + itemDetail.balance.stdPackQty = result.package.stdPackQty + itemDetail.balance.stdPackUnit = result.package.stdPackUnit + this.calcHandleQty(); } else { this.scanPopupGetFocus(); } }); - }else { - this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + } else { + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + + itemStatus + ']不一致,不允许转移!', res => { this.scanPopupGetFocus(); }); } - + } else { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty) ; + itemDetail.handleQty = Number(result.balance.qty); itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; - itemDetail.balance.balanceQty = Number(result.balance.qty) ; - itemDetail.balance.stdPackQty =Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit =result.package.stdPackUnit + itemDetail.balance.balanceQty = Number(result.balance.qty); + itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) + itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty(); } } @@ -323,15 +324,15 @@ title: "提交中....", mask: true }); - - var params =this.setParams() + + var params = this.setParams() console.log("提交参数", JSON.stringify(params)); purchaseReturnJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { this.showCommitSuccessMessage(res.data) } else { - this.showErrorMessage("提交失败["+res.msg+"]") + this.showErrorMessage("提交失败[" + res.msg + "]") } }).catch(error => { uni.hideLoading() @@ -343,14 +344,14 @@ setParams() { var subList = [] var creator = this.$store.state.user.id - + this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { detail.toPackingNumber = detail.packingNumber; detail.toContainerNumber = detail.containerNumber; detail.toBatch = detail.batch; - + detail.toLocationCode = detail.toLocationCode; subList.push(detail) } @@ -368,8 +369,8 @@ let item = this.detailSource[i]; item.subList.forEach(l => { //重复的库位不往里面插入 - var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode) - if (location.length == 0) { + var location = fromlocationList.find(res => res == l.fromLocationCode) + if (location == undefined) { fromlocationList.push(l.fromLocationCode); } //来源库位赋默认值 @@ -380,6 +381,7 @@ } }) } + this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent); }, @@ -428,7 +430,7 @@ showCommitSuccessMessage(number) { this.$refs.comMessage.showSuccessMessage('提交成功
生成退货记录:' + number, res => { - navigateBack(1) + navigateBack(1) }) } } diff --git a/static/config.json b/static/config.json index 2ee5ff0e..5ff11180 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.106:12080/admin-api", + "value": "http://192.168.0.230:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.176:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", From 54edba0e2446a12942c968f8268eda11fa74b6e4 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Thu, 28 Dec 2023 19:34:34 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../record/containerUnBindRecord.vue | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pages/container/record/containerUnBindRecord.vue b/pages/container/record/containerUnBindRecord.vue index d6ec09b2..8a337130 100644 --- a/pages/container/record/containerUnBindRecord.vue +++ b/pages/container/record/containerUnBindRecord.vue @@ -15,7 +15,7 @@ - @@ -90,26 +90,11 @@ data() { return { id: '', - receiptJob: {}, - received: false, - isShowPackingCode: true, scanCount: 0, - jobContent: {}, //任务内容 - subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], - toLocationInfo: {}, businessTypeInfo: {}, fromLocationInfo: {}, - toLocationInfo: {}, - containerCode: "", - isShowLocation: false, - fromlocationTypeList: [], - tolocationTypeList: [], - allowModifyLocation: false, - inInventoryStatus: "", //目标入库库存状态 - outInventoryStatus: "", //来源出库库存状态 - businessType: {} + containerCode: "", }; }, onLoad(option) { @@ -382,6 +367,10 @@ this.detailSource.splice(i, 1) } } + }, + clear() + { + } } } From d796b4e0fd365794edd6a3ea59bfd6a95988b030 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Fri, 29 Dec 2023 09:06:51 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/record/containerBindRecord.vue | 26 +++++++++++++------ static/config.json | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pages/container/record/containerBindRecord.vue b/pages/container/record/containerBindRecord.vue index 487c0571..4a4f553c 100644 --- a/pages/container/record/containerBindRecord.vue +++ b/pages/container/record/containerBindRecord.vue @@ -38,7 +38,8 @@ - + + @@ -142,8 +143,8 @@ getContainerDetailByNumber(this.containerCode).then(res => { if (res.data != null && res.data.subList.length > 0) { this.detailSource = this.getDataSource(res.data.subList) - this.showScanLocation(); } + this.showScanLocation(); }).catch(error => { this.showErrorMessage(error.message) }) @@ -167,15 +168,24 @@ var qty = result.label.qty; var itemCode = result.label.itemCode; - var detail = this.detailSource.find(r => r.itemCode == itemCode); - if (detail == undefined) { - this.showMessage("绑定物料【" + itemCode + "】与现有物料不一致,不可以绑定"); + var item = this.detailSource.find(r => r.itemCode == itemCode); + if (item == undefined) { + + if (this.detailSource.length == 0) { + item = this.createItemInfo(result.label); + let itemDetail = result.balance; + itemDetail.scaned = true; + item.subList.push(itemDetail); + this.detailSource.push(item); + } else { + this.showMessage("绑定物料【" + itemCode + "】与现有物料不一致,不可以绑定"); + } } else { - var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch); + var itemDetail = item.subList.find(r => r.packingNumber == packingNumber && r.batch == batch); if (itemDetail == undefined) { itemDetail = result.balance; itemDetail.scaned = true; - detail.subList.push(itemDetail); + item.subList.push(itemDetail); } else { if (itemDetail.scaned) { this.showMessage("箱码【" + packingNumber + "】,批次【" + batch + "】已经扫描") @@ -266,7 +276,7 @@ }, openScanPopup() { - if (this.fromLocationInfo != null) { + if (this.fromLocationInfo.code != undefined) { this.$refs.scanPopup.openScanPopupForType(this.fromLocationInfo.code, this.businessType); } else { this.showScanLocation(); diff --git a/static/config.json b/static/config.json index 5ff11180..3f6576ad 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.230:12080/admin-api", + "value": "http://dev.ccwin-in.com:25100/api/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.176:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", From c216ac8337bc38bea67219d8c6deeba433c42422 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Fri, 29 Dec 2023 09:30:50 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/container/record/containerBindRecord.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/container/record/containerBindRecord.vue b/pages/container/record/containerBindRecord.vue index 4a4f553c..9429a8b9 100644 --- a/pages/container/record/containerBindRecord.vue +++ b/pages/container/record/containerBindRecord.vue @@ -170,7 +170,6 @@ var item = this.detailSource.find(r => r.itemCode == itemCode); if (item == undefined) { - if (this.detailSource.length == 0) { item = this.createItemInfo(result.label); let itemDetail = result.balance; From f1d71b7339f7d4900f265a7ee393fe94dd5f7c40 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Fri, 29 Dec 2023 09:55:12 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/balance/balance.vue | 4 ++-- mycomponents/record/recordComDetailCard.vue | 4 ++-- pages/putaway/record/putawayRecord.vue | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/mycomponents/balance/balance.vue b/mycomponents/balance/balance.vue index 1d9e56ed..24244efd 100644 --- a/mycomponents/balance/balance.vue +++ b/mycomponents/balance/balance.vue @@ -4,7 +4,7 @@ - + @@ -61,7 +61,7 @@ type: Boolean, default: true }, - isShowLocation: { + isShowFromLocation: { type: Boolean, default: true }, diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue index a27e9af7..393053e6 100644 --- a/mycomponents/record/recordComDetailCard.vue +++ b/mycomponents/record/recordComDetailCard.vue @@ -16,7 +16,7 @@ + :isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="true"> @@ -73,7 +73,7 @@ default: false }, - isShowLocation: { + isShowFromLocation: { type: Boolean, default: true }, diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue index 93dd25a9..62fdf419 100644 --- a/pages/putaway/record/putawayRecord.vue +++ b/pages/putaway/record/putawayRecord.vue @@ -1,24 +1,26 @@ - diff --git a/pages/repleinsh/coms/comScanReplishPack.vue b/pages/repleinsh/coms/comScanReplishPack.vue index 95f1824c..7f1c369c 100644 --- a/pages/repleinsh/coms/comScanReplishPack.vue +++ b/pages/repleinsh/coms/comScanReplishPack.vue @@ -69,7 +69,7 @@ -