From 90fa922ae311387ae3310fe7d5f551248b15c65d Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 25 Dec 2023 16:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=94=9F=E4=BA=A7=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E3=80=81=E9=9D=9E=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mycomponents/coms/task/comUnProduce.vue | 15 +- fe/PDA/pages/task/unProducePick.vue | 2 +- fe/PDA/pages/task/unProducePickDetail.vue | 154 +++----- fe/PDA/pages/task/unProduceReturn.vue | 2 +- fe/PDA/pages/task/unProduceReturnDetail.vue | 359 +++++++----------- fe/PDA/static/menus/dy_menu/menu_pick.svg | 1 + fe/PDA/static/menus/dy_menu/menu_return.svg | 1 + 7 files changed, 201 insertions(+), 333 deletions(-) create mode 100644 fe/PDA/static/menus/dy_menu/menu_pick.svg create mode 100644 fe/PDA/static/menus/dy_menu/menu_return.svg diff --git a/fe/PDA/mycomponents/coms/task/comUnProduce.vue b/fe/PDA/mycomponents/coms/task/comUnProduce.vue index fbe565829..971ea5b4a 100644 --- a/fe/PDA/mycomponents/coms/task/comUnProduce.vue +++ b/fe/PDA/mycomponents/coms/task/comUnProduce.vue @@ -10,14 +10,17 @@ - {{dataContent.materialRequestNumber}} + + {{dataContent.unplannedIssueRequestNumber}} + {{dataContent.unplannedReceiptRequestNumber}} + - + - + 生产线：{{dataContent.prodLine}} + --> @@ -58,6 +61,10 @@ dataContent: { type: Object, value: null + }, + fromType:{ + type: String, + value: "pick" } }, filters: { diff --git a/fe/PDA/pages/task/unProducePick.vue b/fe/PDA/pages/task/unProducePick.vue index aa753d092..8657a78a3 100644 --- a/fe/PDA/pages/task/unProducePick.vue +++ b/fe/PDA/pages/task/unProducePick.vue @@ -5,7 +5,7 @@ - + diff --git a/fe/PDA/pages/task/unProducePickDetail.vue b/fe/PDA/pages/task/unProducePickDetail.vue index 8f716270e..6356fd2f5 100644 --- a/fe/PDA/pages/task/unProducePickDetail.vue +++ b/fe/PDA/pages/task/unProducePickDetail.vue @@ -84,11 +84,11 @@ - + - + @@ -115,7 +115,7 @@ takeIssueJob, cancelTakeIssueJob, finshUnProducePickJob, - issueBalances + getBalancesByFilter } from '@/api/index.js'; import { getJobStatuStyle, @@ -188,13 +188,12 @@ // } this.getDetail(); }, - onReady() { - }, + onReady() {}, //返回首页 onNavigationBarButtonTap(e) { if (e.index === 0) { goHome(); - }else if(e.index === 1){ + } else if (e.index === 1) { window.location.reload(); } }, @@ -309,31 +308,31 @@ dyIssue(result, scaned) { let that = this; var itemCode = that.details.find(r => { - return r.itemCode === result.data.itemCode&& - r.scaned === scaned + return r.itemCode === result.data.itemCode && + r.scaned === scaned }) if (itemCode == undefined) { that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中'); - }else { + } else { //零件号相同、箱码相同 var itemCode1 = that.details.find(r => { - return r.itemCode === result.data.itemCode&& - r.recommendPackingCode === result.data.code + return r.itemCode === result.data.itemCode && + r.recommendPackingCode === result.data.code r.scaned === scaned }) //零件号相同、箱码不相同 - if(itemCode1 == undefined){ + if (itemCode1 == undefined) { var itemCode2 = that.details.find(r => { - return r.itemCode === result.data.itemCode&& - r.recommendLot === result.data.lot - &&r.scaned === scaned + return r.itemCode === result.data.itemCode && + r.recommendLot === result.data.lot && + r.scaned === scaned }) //零件号相同、箱码不相同、批次相同 - if(itemCode2==undefined){ + if (itemCode2 == undefined) { //零件号相同、箱码不相同、批次不相同 console.log("零件号相同、箱码不相同、批次不相同") setTimeout(res => { - showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { + showConfirmMsg(itemCode.recommendPackingCode + '未执行先进先出或不是最先批次,是否继续?', confirm => { if (confirm) { that.currentItem = itemCode; that.afterScanPackLabel(result); @@ -342,28 +341,29 @@ } }); }, 100) - - }else { + + } else { console.log("零件号相同、箱码不相同、批次相同") //零件号相同、箱码不相同、批次相同 that.currentItem = itemCode2; that.afterScanPackLabel(result); } - - - }else { + + + } else { //零件号相同、箱码相同、批次相同 var itemCode3 = that.details.find(r => { - return r.itemCode === result.data.itemCode&& - r.recommendPackingCode === result.data.code&& - r.recommendLot === result.data.lot - &&r.scaned === scaned + return r.itemCode === result.data.itemCode && + r.recommendPackingCode === result.data.code && + r.recommendLot === result.data.lot && + r.scaned === scaned }) - if(itemCode3==undefined){ + if (itemCode3 == undefined) { //零件号相同、箱码相同、批次不同 console.log("零件号相同、箱码相同、批次不同") setTimeout(res => { - showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { + showConfirmMsg(itemCode1.recommendPackingCode + '未执行先进先出或不是最先批次,是否继续?', + confirm => { if (confirm) { that.currentItem = itemCode1; that.afterScanPackLabel(result); @@ -372,8 +372,8 @@ } }); }, 100) - - }else { + + } else { console.log("零件号相同、箱码相同、批次相同") //零件号相同、箱码相同、批次相同 that.currentItem = itemCode3; @@ -381,67 +381,7 @@ } } } - - - // that.currentItem = that.details.find(r => { - // return r.itemCode === result.data.itemCode && - // r.recommendPackingCode === result.data.code && - // r.recommendLot === result.data.lot && - // r.scaned === scaned - // }); - - - - // //没找到符合的箱码、零件号、箱码、批次都相等 - // if (that.currentItem === undefined) { - // var itemCode = that.details.find(res => { - // return res.itemCode === result.data.itemCode && - // res.scaned === scaned - // }) - // //零件号相等 - // if (itemCode != undefined) { - // var lot = that.details.find(res => { - // return res.itemCode === result.data.itemCode && - // res.recommendLot === result.data.lot && - // res.scaned === scaned - // }) - // if (lot != undefined) { - // //通过 - // that.currentItem = lot; - // that.afterScanPackLabel(result); - // } else { - // //批次不相等 - // // 提示未执行先进先出或者不是最先批次。 - // setTimeout(res => { - // showConfirmMsg('未执行先进先出或不是最先批次,是否继续?', confirm => { - // if (confirm) { - // that.currentItem = itemCode; - // that.afterScanPackLabel(result); - // } else { - // that.scanPopupGetFocus(); - // } - // }); - // }, 100) - - // } - // } else { - // //零件号不相等 - // var lot = that.details.find(res => { - // return res.recommendLot === result.data.lot && - // res.scaned === scaned - // }) - // //批次相等 - // if (lot != undefined) { - // // 在该任务中未找到零件。 - // that.showScanMessage('在该任务中未找到零件'); - // } else { - // //零件号不相等,批次不相等 - // that.showScanMessage('所扫描的物料不在任务中'); - // } - // } - // } else { - // that.afterScanPackLabel(result); - // } + }, afterScanPackLabel(result) { @@ -472,15 +412,15 @@ itemCode: result.data.itemCode, lot: result.data.lot, inventoryStatus: 2, //库存状态默认2 - locationTypes: [2, 3], + locationTypes: [2], sortBy: 'PackingCode asc' }; - issueBalances(params) + getBalancesByFilter(params) .then(res => { if (res.totalCount === 0) { this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' + result - .data.lot + '】在【原料库、半成品库】未查询到库存信息'); + .data.lot + '】在【原料库】未查询到库存信息'); } else { callback(res); } @@ -523,7 +463,7 @@ item.scanPackingCode = this.currentScanLebel.data.code; item.scanLot = this.currentScanLebel.data.lot; - item.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; + item.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN; item.uom = balanceItem.uom; this.details.sort(compareDesc('scanDate')); //按扫描信息排 @@ -553,12 +493,12 @@ submit() { let that = this; if (that.datacontent.details.length === 0) { - this.showMessage('该任务没有要上架的零件'); + this.showMessage('该任务没有选择的零件'); return; } let checkItems = that.details.filter(r => r.scaned === true); if (checkItems.length < that.details.length) { - showConfirmMsg('还有未扫描的零件,是否继续发料', confirm => { + showConfirmMsg('还有未扫描的零件,是否提交?', confirm => { if (confirm) { that.finsh(); } @@ -601,7 +541,7 @@ items.forEach(r => { packingCodes += r.recommendPackingCode + ',' }) - showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续发料?【' + packingCodes + "】", confirm => { + showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续领料?【' + packingCodes + "】", confirm => { if (confirm) { that.finsh(); } else { @@ -622,7 +562,8 @@ that.datacontent.completeUserId = localStorage.getItem('userId') that.datacontent.completeUserName = localStorage.getItem('userName_CN') that.datacontent.completeTime = getCurrDateTime(); - that.datacontent.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; + that.datacontent.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage + .userName_CN; that.datacontent.details = that.details; let params = JSON.stringify(that.datacontent); finshUnProducePickJob(that.id, params) @@ -641,11 +582,12 @@ //返回任务列表页 backJobList(delay) { - setTimeout(() => { - uni.navigateTo({ - url: './unProducePick' - }) - }, 1000) + uni.navigateBack() + // setTimeout(() => { + // uni.navigateTo({ + // url: './unProducePick' + // }) + // }, 1000) }, clear() { @@ -717,12 +659,12 @@ }, qtyChanged(value, item, index) { if (value <= 0) { - this.showMessage('发料数量不能小于或等于0') + this.showMessage('领料数量不能小于或等于0') item.handledQty = item.defaultHandleQty this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); } else if (value > item.defaultHandleQty) { item.handledQty = item.defaultHandleQty - this.showMessage('发料数量不能大于库存数量:' + item.handledQty) + this.showMessage('领料数量不能大于库存数量:' + item.handledQty) this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); } }, diff --git a/fe/PDA/pages/task/unProduceReturn.vue b/fe/PDA/pages/task/unProduceReturn.vue index 62a28fa7a..a85c1cf74 100644 --- a/fe/PDA/pages/task/unProduceReturn.vue +++ b/fe/PDA/pages/task/unProduceReturn.vue @@ -5,7 +5,7 @@ - + diff --git a/fe/PDA/pages/task/unProduceReturnDetail.vue b/fe/PDA/pages/task/unProduceReturnDetail.vue index 08dca29a7..6b6751c78 100644 --- a/fe/PDA/pages/task/unProduceReturnDetail.vue +++ b/fe/PDA/pages/task/unProduceReturnDetail.vue @@ -70,13 +70,13 @@ - 库位 + 目标库位 - {{ item.recommendFromLocationCode }} + {{ item.recommendToLocationCode }} - {{ item.handledFromLocationCode }} + {{ item.toLocationCode }} @@ -84,8 +84,12 @@ - - + + + + + @@ -106,11 +110,11 @@