From a1e6ec03c1e5d89dfbd1de8119faa20203928962 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 17 Jun 2024 19:31:18 +0800 Subject: [PATCH 01/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/job/jobFilter.vue | 2 +- src/pages/issue/coms/comScanIssuePack.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 2254de73..2ef38ac8 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -57,7 +57,7 @@ import winScanAsnNumber from "@/mycomponents/scan/winScanAsnNumber.vue" export default { - emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber"], + emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber","productionLineCode","fromLocationCode"], components: { winScanJobNumber, winScanAsnNumber diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 7051d9b2..a94fea2d 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -123,7 +123,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; export default { name: 'winScanPack', - emits: ["afterScan"], + emits: ["afterScan","closeScan"], components: { winComScan, balance, From 7d2eec95d2c850c61c0e5ba6a4437990908e3a41 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 18 Jun 2024 11:24:38 +0800 Subject: [PATCH 02/58] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/recommend/recommend.vue | 14 +++++++++++++- src/mycomponents/scan/winComScanFg.vue | 4 ++++ src/mycomponents/scan/winScanFgLabel.vue | 7 +++++++ .../productReceipt/job/fgProductReceiptDetail.vue | 6 +++++- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue index bf7b175a..4aa55e52 100644 --- a/src/mycomponents/recommend/recommend.vue +++ b/src/mycomponents/recommend/recommend.vue @@ -93,7 +93,19 @@ }, watch: { - + // 模拟扫描功能 + detail: { + handler(newVal, oldVal) { + if(newVal.scaned){ + newVal.copyContent = "HPQ;V1.0;I" + newVal.itemCode + ";P" + newVal.packingNumber + ";B" + newVal.batch + ";Q" + newVal.qty + }else{ + newVal.copyContent = '' + } + console.log('newVal.copyContent',newVal.copyContent) + }, + immediate: true, + deep: true + } }, methods: { copy() { diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue index 68d87e2f..3fd8393b 100644 --- a/src/mycomponents/scan/winComScanFg.vue +++ b/src/mycomponents/scan/winComScanFg.vue @@ -139,6 +139,10 @@ }, 1000); // #endif }, + setItemCodeSimulate(itemCode,scanMsg) { + this.itemCode = itemCode; + this.scanMsg = scanMsg; + }, setItemCode(itemCode) { this.itemCode = itemCode; }, diff --git a/src/mycomponents/scan/winScanFgLabel.vue b/src/mycomponents/scan/winScanFgLabel.vue index f0e5389f..552d3b0e 100644 --- a/src/mycomponents/scan/winScanFgLabel.vue +++ b/src/mycomponents/scan/winScanFgLabel.vue @@ -21,6 +21,8 @@ + + @@ -52,6 +54,11 @@ }, methods: { + //模拟扫描功能 + simulateScan(item){ + this.$refs.comscansimulate.setItemCodeSimulate(item.itemCode,item.copyContent) + this.$refs.comscansimulate.clickScanMsg(); + }, openScanPopup(itemCode) { setTimeout(res => { this.$refs.popup.open('bottom') diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 51cca9c7..7e1d2d5a 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -231,7 +231,11 @@ that.detailSource.forEach(r => { r.subList.forEach(s => { if (this.scanedPackingNumber && this.scanedPackingNumber == s - .packingNumber) s.scaned = true + .packingNumber) { + s.scaned = true + //模拟扫描功能 + this.$refs.scanPopup.simulateScan(s); + } }) }) From 831f84fd40639376d5aba0feaa36d87c357aec97 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 18 Jun 2024 13:05:49 +0800 Subject: [PATCH 03/58] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 7 ++++--- src/pages/pointPutawayJob/index.vue | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/api/request2.js b/src/api/request2.js index 9cecc192..2e0612ad 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -4154,9 +4154,10 @@ export function isCheckMesCode(code) { * 获取上架任务打印明细 * @param {*} */ -export function getJimuPutawayJobDetail(ids) { +export function getJimuPutawayJobDetail(data) { return request({ - url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA?masterIds="+ids, - method: "get", + url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA", + method: "post", + data:data }); } diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 7147a978..8e121fee 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -14,7 +14,7 @@ 创建人：{{data.creator||''}} - 创建时间：{{data.createTime}} + 创建时间：{{formatDate(data.createTime)}} @@ -50,6 +50,9 @@ import { getJimuPutawayJobDetail } from '@/api/request2.js'; + import { + dateFormat + } from '@/common/basic.js'; // 打印页面的模板 const htmlFileUrl = '/hybrid/html/pointPutawayJob.html'; import { @@ -93,8 +96,11 @@ }, function(e) { console.log("获取图片资源失败：" + e.message); }); - } + }, // #endif + formatDate(val) { + return dateFormat(val) + } }, watch: { isLoadFinish: { @@ -115,7 +121,9 @@ } }, async onShow() { - await getJimuPutawayJobDetail(this.data.ids).then(res=>{ + await getJimuPutawayJobDetail({ + masterIds:this.data.ids + }).then(res=>{ this.data.sublist = res.data }) // 获取数据 @@ -187,7 +195,7 @@ 创建人：${this.data.creator}
- 创建时间：${this.data.createTime} + 创建时间：${this.formatDate(this.data.createTime)}
From ce63c3983d9b54f9ce91ffd1bd05568469e26cc4 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 18 Jun 2024 13:48:02 +0800 Subject: [PATCH 04/58] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=95=B0=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseReceipt/job/receiptDetail.vue | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 0ee548a5..c2caebec 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -459,14 +459,15 @@ title: "提交成功,将跳转到打印页面", mask: true }); + // 获取上架任务 let timerCount = 0 const timer1 = setInterval(async ()=>{ - if(timerCount == 10){ + if(timerCount == 15){ clearInterval(timer1) - uni.showLoading({ + uni.showToast({ title: "跳转打印页面失败", - mask: true + icon: "none" }); return; } @@ -474,22 +475,21 @@ filters: [{ column: "purchaseReceiptRecordNumber", action: "in", - value: res.data + value: res.data.number }], pageNo: 1, pageSize: 1000, - }).then(res=>{ + }).then(res1=>{ timerCount = timerCount + 1 - console.log(11111) - if(res.data && res.data.list&&res.data.list.length){ + if(res1.data && res1.data.list&&res1.data.list.length&&(res1.data.total >= res.data.detailCount)){ uni.hideLoading() clearInterval(timer1) const dataParams = { - toLocationCode: res.data.list[0].toLocationCode, - number: res.data.list[0].number, - creator: res.data.list[0].creator, - createTime: res.data.list[0].createTime, - ids : res.data.list.map(item=>item.masterId).join(',') + toLocationCode: res1.data.list[0].toLocationCode, + number: res1.data.list[0].number, + creator: res1.data.list[0].creator, + createTime: res1.data.list[0].createTime, + ids : res1.data.list.map(item=>item.masterId).join(',') } console.log(dataParams) uni.navigateTo({ @@ -497,7 +497,7 @@ }) } }) - },1000) + },2000) } else { this.showErrorMessage("提交失败[" + res.msg + "]") From 2cd14de25ba7eba85d0275b49f778e187350cc51 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 18 Jun 2024 14:40:13 +0800 Subject: [PATCH 05/58] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/package/packageCard.vue | 13 +++ src/mycomponents/scan/winComScan.vue | 3 + src/mycomponents/scan/winScanPack.vue | 7 ++ .../scan/winScanPackAndLocation.vue | 35 ++++++ .../job/productReceiptDetail.vue | 5 +- .../purchaseReceipt/job/receiptDetail.vue | 102 ++++++++++-------- src/pages/putaway/job/putawayDetail.vue | 42 ++++++-- src/pages/putaway/job/putawayJob.vue | 2 +- 8 files changed, 154 insertions(+), 55 deletions(-) diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue index 4ddd0e74..e6601d05 100644 --- a/src/mycomponents/package/packageCard.vue +++ b/src/mycomponents/package/packageCard.vue @@ -93,6 +93,19 @@ }, watch: { + // 模拟扫描功能 + dataContent: { + handler(newVal, oldVal) { + if(newVal.scaned){ + newVal.copyContent = "HPQ;V1.0;I" + newVal.itemCode + ";P" + newVal.packingNumber + ";B" + newVal.batch + ";Q" + newVal.qty + }else{ + newVal.copyContent = '' + } + console.log('newVal.copyContent',newVal.copyContent) + }, + immediate: true, + deep: true + } }, methods: { diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue index 214881f7..63b5b193 100644 --- a/src/mycomponents/scan/winComScan.vue +++ b/src/mycomponents/scan/winComScan.vue @@ -145,6 +145,9 @@ this.placeholderValue = '请扫描' + this.placeholder; }, methods: { + setItemCodeSimulate(scanMsg) { + this.scanMsg = scanMsg; + }, hide() { // #ifdef APP-PLUS // 只是解决软键盘的闪现 diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue index 8913073f..1981c301 100644 --- a/src/mycomponents/scan/winScanPack.vue +++ b/src/mycomponents/scan/winScanPack.vue @@ -20,6 +20,8 @@ + + @@ -55,6 +57,10 @@ }, methods: { + simulateScan(item){ + this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent) + this.$refs.comscansimulate.clickScanMsg(); + }, openScanPopup() { setTimeout(res => { this.$refs.popup.open('bottom') @@ -75,6 +81,7 @@ }, getScanResult(result) { + if (result.success) { this.$emit("getResult", result); } else { diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index eef6b720..2a1ab0f6 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -46,6 +46,9 @@ + + + @@ -172,6 +175,38 @@ this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 }, + //模拟扫描 + openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent,item) { + this.fromLocationCode = fromLocationCode; + this.fromLocationList = fromLocationList; + if (fromLocationCode != '') { + // this.packGetFocus(); + if (this.$refs.comscansimulate != undefined) { + this.$refs.comscansimulate.getfocus(); + } + + } else { + if (this.fromLocationList.length == 0) { + // this.locationGetFocus(); + alert('没有来源库位：List') + } else { + this.fromLocationCode = this.fromLocationList[0]; + } + } + + this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses) + this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 + this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 + let timer = setTimeout(res => { + if(timer){ + clearTimeout(timer) + } + // this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent) + // this.$refs.comscansimulate.clickScanMsg(); + }, 500) + + + }, closeScanPopup(content) { this.$refs.popup.close(); diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 001c95db..468d20fb 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -223,8 +223,9 @@ r.subList.forEach(s => { if (this.scanedPackingNumber && this.scanedPackingNumber == s .packingNumber){ - s.scaned = true - s.handleQty =s.qty + s.scaned = true + this.$refs.scanPopup.simulateScan(s); + // s.handleQty =s.qty } }) }) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index c2caebec..aa97f967 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -98,10 +98,13 @@ import winScanPack from '@/mycomponents/scan/winScanPack.vue' import locationCompare from '@/mycomponents/location/locationCompare.vue' import comReceiptDetailCard from '@/pages/purchaseReceipt/coms/comReceiptDetailCard.vue' - import jobTopAsn from '@/mycomponents/job/jobTopAsn.vue' - import { - productDismantleJobClose - } from '@/api/request2.js'; + import jobTopAsn from '@/mycomponents/job/jobTopAsn.vue' + import { + productDismantleJobClose + } from '@/api/request2.js'; + import { + nextTick + } from 'vue'; export default { name: 'receipt_detail', @@ -137,7 +140,7 @@ onLoad(option) { this.id = option.id; - // this.scanedPackingNumber = option.scaned || ''; + this.scanedPackingNumber = option.scaned || ''; this.operation = option.operation; if (this.id != undefined) { //新建的任务自动接收 @@ -219,13 +222,19 @@ that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode that.detailSource = getTreeDataSource(that.subList) - that.detailSource.forEach(r => { - r.subList.forEach(s => { - if (this.scanedPackingNumber && this.scanedPackingNumber == s - .packingNumber) s.scaned = true + that.isAllReceived = false; + nextTick(() => { + that.detailSource.forEach(r => { + r.subList.forEach(s => { + if (this.scanedPackingNumber && this + .scanedPackingNumber == s + .packingNumber) { + s.scaned = true + this.$refs.scanPopup.simulateScan(s); + } + }) }) }) - that.isAllReceived = false; } else { that.showMessage('列表数据为0'); } @@ -395,11 +404,11 @@ } else if (this.scanCount < this.subList.length) { //扫描数量小于任务数量，判断是否允许部分提交 if (this.jobContent.allowPartialComplete == "TRUE") { - //提交 - this.$refs.comMessage.showQuestionMessage('还有未扫描的物料，是否继续提交?', res => { - if (res) { - this.submitJob(); - } + //提交 + this.$refs.comMessage.showQuestionMessage('还有未扫描的物料，是否继续提交?', res => { + if (res) { + this.submitJob(); + } }); } else { //不允许部分提交，提示 @@ -417,21 +426,21 @@ reject() { this.$refs.comMessage.showQuestionMessage('是否要拒收任务
[' + this.jobContent.asnNumber + ']?', res => { - if (res) { - uni.showLoading({ - title: "提交中....", - mask: true - }); - productDismantleJobClose(this.id).then(res => { - console.log('拒收',res) - if (res.data) { - navigateBack(1) - } else { - this.showErrorMessage(res.msg) - } - }).catch(error => { - uni.hideLoading() - this.showErrorMessage(error) + if (res) { + uni.showLoading({ + title: "提交中....", + mask: true + }); + productDismantleJobClose(this.id).then(res => { + console.log('拒收', res) + if (res.data) { + navigateBack(1) + } else { + this.showErrorMessage(res.msg) + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) }) } }) @@ -459,11 +468,11 @@ title: "提交成功,将跳转到打印页面", mask: true }); - + // 获取上架任务 let timerCount = 0 - const timer1 = setInterval(async ()=>{ - if(timerCount == 15){ + const timer1 = setInterval(async () => { + if (timerCount == 15) { clearInterval(timer1) uni.showToast({ title: "跳转打印页面失败", @@ -479,26 +488,33 @@ }], pageNo: 1, pageSize: 1000, - }).then(res1=>{ + }).then(res1 => { timerCount = timerCount + 1 - if(res1.data && res1.data.list&&res1.data.list.length&&(res1.data.total >= res.data.detailCount)){ + if (res1.data && res1.data.list && res1.data + .list.length && (res1.data.total >= res + .data.detailCount)) { uni.hideLoading() clearInterval(timer1) const dataParams = { - toLocationCode: res1.data.list[0].toLocationCode, - number: res1.data.list[0].number, - creator: res1.data.list[0].creator, - createTime: res1.data.list[0].createTime, - ids : res1.data.list.map(item=>item.masterId).join(',') + toLocationCode: res1.data.list[0] + .toLocationCode, + number: res1.data.list[0].number, + creator: res1.data.list[0].creator, + createTime: res1.data.list[0] + .createTime, + ids: res1.data.list.map(item => + item.masterId).join(',') } console.log(dataParams) uni.navigateTo({ - url:'/pages/pointPutawayJob/index?data='+encodeURIComponent(JSON.stringify(dataParams)) + url: '/pages/pointPutawayJob/index?data=' + + encodeURIComponent(JSON + .stringify(dataParams)) }) } }) - },2000) - + }, 2000) + } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 7551de0a..d90d36c2 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -190,15 +190,6 @@ that.jobStatus = res.data.status that.subList = res.data.subList; that.detailSource = getTreeDataSource(that.subList) - - that.detailSource.forEach(r => { - r.subList.forEach(s => { - if (this.scanedPackingNumber && this.scanedPackingNumber == s - .packingNumber) s.scaned = true - s.inventoryStatus = s.inspectResult; //更新检验结果状态 - }) - }) - that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode; that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) @@ -208,6 +199,18 @@ } else { that.toLocationCode = that.jobToLocationCode; } + that.detailSource.forEach(r => { + r.subList.forEach(s => { + if (this.scanedPackingNumber && this.scanedPackingNumber == s + .packingNumber) { + s.scaned = true + s.packList.forEach(item=>item.scaned = true) + s.inventoryStatus = s.inspectResult; //更新检验结果状态 + this.openScanPopupSimulate(s) + } + + }) + }) } else { that.showMessage('列表数据为0'); @@ -252,6 +255,27 @@ // this.calcHandleQty(); calcTreeHandleQty(this.detailSource) }, + //模拟扫描功能 + openScanPopupSimulate(item){ + + let fromlocationCode = ''; + let fromlocationList = []; + for (var i = 0; i < this.detailSource.length; i++) { + let item = this.detailSource[i]; + item.subList.forEach(l => { + //重复的库位不往里面插入 + var location = fromlocationList.find(res => res == l.fromLocationCode) + if (location == undefined) { + fromlocationList.push(l.fromLocationCode); + } + //来源库位赋默认值 + if (fromlocationCode == '') { + fromlocationCode = l.fromLocationCode; + } + }) + } + this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,item); + }, openScanPopup() { let fromlocationCode = ''; diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index ef54b650..acf3f724 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -298,7 +298,7 @@ selectItem(item) { this.$refs.scanPopup.closeScanPopup(); uni.navigateTo({ - url: './putawayDetail?id=' + item.masterId + '&status=' + item.status + url: './putawayDetail?id=' + item.masterId + '&status=' + item.status+'&scaned='+item.packingNumber }); }, getScanResult(result) { From db43a524255a998c11df9f40da3aa74eecf0707c Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 18 Jun 2024 15:05:14 +0800 Subject: [PATCH 06/58] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/productPutawayDetail.vue | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 3e55d22f..54b45e4a 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -199,21 +199,23 @@ that.jobToLocationCode = that.subList[0].toLocationCode that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) - that.detailSource.forEach(r => { - r.subList.forEach(s => { - if (this.scanedPackingNumber && this.scanedPackingNumber == s - .packingNumber) { - s.scaned = true - s.handleQty =s.qty - } - }) - }) + that.isCheckLocation = getSwitchInfoByCode(that.switchCode) if (that.isCheckLocation) { that.toLocationCode = "" } else { that.toLocationCode = that.jobToLocationCode; - } + } + that.detailSource.forEach(r => { + r.subList.forEach(s => { + if (this.scanedPackingNumber && this.scanedPackingNumber == s + .packingNumber) { + s.scaned = true + // s.handleQty =s.qty + this.openScanPopupSimulate(s) + } + }) + }) } else { that.showMessage('列表数据为0'); } @@ -246,6 +248,25 @@ openDetail(item) { this.$refs.detailInfoPopup.openPopup(item) + }, + openScanPopupSimulate(item) { + let fromlocationCode = ''; + let fromlocationList = []; + for (var i = 0; i < this.detailSource.length; i++) { + let item = this.detailSource[i]; + item.subList.forEach(l => { + //重复的库位不往里面插入 + var location = fromlocationList.find(res => res == l.fromLocationCode) + if (location == undefined) { + fromlocationList.push(l.fromLocationCode); + } + //来源库位赋默认值 + if (fromlocationCode == '') { + fromlocationCode = l.fromLocationCode; + } + }) + } + this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,item); }, openScanPopup() { From c52f9a14264f2c0f85fc6fcd8c5e28c4a7eef045 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 18 Jun 2024 19:11:08 +0800 Subject: [PATCH 07/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8D=E6=98=AF=E4=BB=BB=E5=8A=A1=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueDetail.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 402b3124..9c75f0f4 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -56,6 +56,7 @@ getCurrDateTime, getDirectoryItemArray, getPackingNumberAndBatch, + deepCopyData } from '@/common/basic.js'; import { @@ -354,7 +355,7 @@ } subItem.recordList.push(record); }) - subList.push(subItem); + subList.push(deepCopyData(subItem)); } } }) @@ -493,9 +494,6 @@ this.scanPopupGetFocus(); }, - showScanMessage(message) { - this.$refs.comMessage.showScanMessage(message); - }, closeScanMessage() { this.scanPopupGetFocus(); From a0afbf3966c3e93292a2cd79f6c775bc7a3f1277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 18 Jun 2024 19:19:04 +0800 Subject: [PATCH 08/58] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=20=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pointPutawayJob/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 8e121fee..0586b6ee 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -221,7 +221,7 @@ - + ` From 54189f6128e12923401c0a3cfcc162024e86b7e1 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 18 Jun 2024 19:52:55 +0800 Subject: [PATCH 09/58] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winScanPack.vue | 10 +++-- .../scan/winScanPackAndLocation.vue | 12 ++++-- .../job/productPutawayDetail.vue | 38 ++++++++++------- .../job/productReceiptDetail.vue | 38 ++++++++++------- .../purchaseReceipt/job/receiptDetail.vue | 41 +++++++++++-------- src/pages/putaway/job/putawayDetail.vue | 5 ++- 6 files changed, 89 insertions(+), 55 deletions(-) diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue index 1981c301..44a08fc3 100644 --- a/src/mycomponents/scan/winScanPack.vue +++ b/src/mycomponents/scan/winScanPack.vue @@ -73,15 +73,19 @@ }, scanClick() { - this.$refs.comscan.clickScanMsg(); + if(this.$refs.comscan){ + this.$refs.comscan.clickScanMsg(); + } + }, cancelClick() { - this.$refs.comscan.clearScanValue(); + if(this.$refs.comscan){ + this.$refs.comscan.clearScanValue(); + } }, getScanResult(result) { - if (result.success) { this.$emit("getResult", result); } else { diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index 2a1ab0f6..fe64744a 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -201,8 +201,8 @@ if(timer){ clearTimeout(timer) } - // this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent) - // this.$refs.comscansimulate.clickScanMsg(); + this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent) + this.$refs.comscansimulate.clickScanMsg(); }, 500) @@ -385,7 +385,9 @@ //盘点回调 countCallBack(datas) { - this.$refs.comscan.clear(); + if(this.$refs.comscan){ + this.$refs.comscan.clear(); + } //返回标签信息、库存信息和管理模式 let data = { label: this.scanResult.label, @@ -399,7 +401,9 @@ }, packCallBack(item) { - this.$refs.comscan.clear(); + if(this.$refs.comscan){ + this.$refs.comscan.clear(); + } //返回标签信息、库存信息和管理模式 let data = { label: this.scanResult.label, diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 54b45e4a..4f08a2f2 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -114,13 +114,15 @@ type: "", isCheckLocation: false, switchCode: "", - scanedPackingNumber: '' + scanedPackingNumber: '', + status:'' }; }, onLoad(option) { this.id = option.id; this.type = option.type; - this.scanedPackingNumber = option.scaned || ''; + this.scanedPackingNumber = option.scaned || ''; + this.status = option.status || '' if (this.type == 'predict') { this.switchCode = "SemiPutawayLocationCodeValidate" updateTitle("预生产上架任务"); @@ -128,16 +130,19 @@ this.switchCode = "FgPutawayLocationCodeValidate" updateTitle("装配上架任务"); } - if (this.id != undefined) { - //新建的任务自动接收 - if (option.status == "1") { - this.receive((callback => { - this.getDetail(); - })); - } else { - this.getDetail(); - } - } + + }, + onShow(){ + if (this.id != undefined) { + //新建的任务自动接收 + if (this.status == "1") { + this.receive((callback => { + this.getDetail(); + })); + } else { + this.getDetail(); + } + } }, //返回首页 onNavigationBarButtonTap(e) { @@ -211,6 +216,7 @@ if (this.scanedPackingNumber && this.scanedPackingNumber == s .packingNumber) { s.scaned = true + s.cancleScanedHiht = true // s.handleQty =s.qty this.openScanPopupSimulate(s) } @@ -295,7 +301,8 @@ this.$refs.scanPopup.closeScanPopup(); }, - getScanResult(result) { + getScanResult(result) { + try { var packingNumber = result.balance.packingNumber; var batch = result.balance.batch; @@ -316,8 +323,9 @@ if (itemDetail == undefined) { this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result .fromLocationCode + "】不在列表中") - } else { - if (itemDetail.scaned) { + } else { + + if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) { this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result .fromLocationCode + "】已经扫描") } else { diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 468d20fb..3b269100 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -134,23 +134,27 @@ managementList: [], jobStatus: "", jobToLocationCode: "", - scanedPackingNumber: '' - + scanedPackingNumber: '', + status:'' }; }, onLoad(option) { this.id = option.id; - this.scanedPackingNumber = option.scaned || ''; - if (this.id != undefined) { - //新建的任务自动接收 - if (option.status == "1") { - this.receive((callback => { - this.getDetail(); - })); - } else { - this.getDetail(); - } - } + this.scanedPackingNumber = option.scaned || ''; + this.status = option.status || '' + + }, + onShow(){ + if (this.id != undefined) { + //新建的任务自动接收 + if (this.status == "1") { + this.receive((callback => { + this.getDetail(); + })); + } else { + this.getDetail(); + } + } }, //返回首页 onNavigationBarButtonTap(e) { @@ -224,6 +228,9 @@ if (this.scanedPackingNumber && this.scanedPackingNumber == s .packingNumber){ s.scaned = true + s.cancleScanedHiht = true + s.copyContent = "HMQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty + this.$refs.scanPopup.simulateScan(s); // s.handleQty =s.qty } @@ -239,7 +246,8 @@ }) }, - getScanResult(result) { + getScanResult(result) { + let label = result.label; var packingNumber = label.packingNumber; var batch = label.batch; @@ -256,7 +264,7 @@ if (itemDetail == undefined) { this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中") } else { - if (itemDetail.scaned) { + if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) { this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描") } else { itemDetail.scaned = true; diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index aa97f967..ab0eb84c 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -133,7 +133,8 @@ jobStatus: "", isAllReceived: false, operation: '', - scanedPackingNumber: '' + scanedPackingNumber: '', + status:'' }; }, @@ -142,16 +143,20 @@ this.id = option.id; this.scanedPackingNumber = option.scaned || ''; this.operation = option.operation; - if (this.id != undefined) { - //新建的任务自动接收 - if (option.status == "1") { - this.receive((callback => { - this.getDetail(); - })); - } else { - this.getDetail(); - } - } + this.status = option.status; + }, + + onShow(){ + if (this.id != undefined) { + //新建的任务自动接收 + if (this.status == "1") { + this.receive((callback => { + this.getDetail(); + })); + } else { + this.getDetail(); + } + } }, //返回首页 onNavigationBarButtonTap(e) { @@ -229,7 +234,10 @@ if (this.scanedPackingNumber && this .scanedPackingNumber == s .packingNumber) { - s.scaned = true + s.scaned = true + s.cancleScanedHiht = true + + s.copyContent = "HPQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty this.$refs.scanPopup.simulateScan(s); } }) @@ -246,7 +254,8 @@ }, - getScanResult(result) { + getScanResult(result) { + try { var itemCode = result.label.itemCode; var detail = this.detailSource.find(r => r.itemCode == itemCode); @@ -260,7 +269,7 @@ if (itemDetail.length == 0) { this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中") } else { - if (itemDetail[0].scaned) { + if (!itemDetail[0].cancleScanedHiht&&itemDetail[0].scaned) { this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描") } else { itemDetail.forEach(item => { @@ -307,7 +316,7 @@ if (isExit == undefined) { this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中") } else { - if (isExit.scaned) { + if (!isExit.cancleScanedHiht&&isExit.scaned) { this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { isExit.scaned = true @@ -325,7 +334,7 @@ scanedLength++; } }) - if (itemDetail.scaned && scanedLength == itemDetail.packList.length) { + if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) { this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { itemDetail.scaned = true; diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index d90d36c2..0a2513c8 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -204,6 +204,7 @@ if (this.scanedPackingNumber && this.scanedPackingNumber == s .packingNumber) { s.scaned = true + s.cancleScanedHiht = true s.packList.forEach(item=>item.scaned = true) s.inventoryStatus = s.inspectResult; //更新检验结果状态 this.openScanPopupSimulate(s) @@ -345,7 +346,7 @@ this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result .fromLocationCode + "】不在列表中") } else { - if (isExit.scaned) { + if (!isExit.cancleScanedHiht&&isExit.scaned) { this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { isExit.scaned = true @@ -372,7 +373,7 @@ //大哥让加的 itemDetail.fromInventoryStatus = result.balance.inventoryStatus; - if (itemDetail.scaned && scanedLength == itemDetail.packList.length) { + if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) { this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { itemDetail.scaned = true; From 333427db6b8a2797b62aed87c6529f234d89379f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 18 Jun 2024 19:53:25 +0800 Subject: [PATCH 10/58] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=20?= =?UTF-8?q?=E6=89=93=E5=8D=B0=20=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pointPutawayJob/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 0586b6ee..6b717b21 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -33,7 +33,7 @@ {{cur.batch}}{{cur.packingNumber}}{{cur.packUnit}} - {{cur.packQty}} + {{cur.qty}}{{cur.uom}} From 06eebdd125c379a60a09093c1438f45d4ec5e5d1 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 18 Jun 2024 19:58:44 +0800 Subject: [PATCH 11/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=85=E9=85=8D?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1=E4=B8=BA=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 2 +- src/pages/productPutaway/job/productPutawayDetail.vue | 11 +++++++---- src/pages/productPutaway/job/productPutawayJob.vue | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/pages.json b/src/pages.json index ec171383..39cfa49e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -896,7 +896,7 @@ { "path": "pages/productPutaway/job/fgProductPutawayJob", "style": { - "navigationBarTitleText": "装配上架任务", + "navigationBarTitleText": "成品入库任务", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 54b45e4a..cdd6feab 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -114,7 +114,8 @@ type: "", isCheckLocation: false, switchCode: "", - scanedPackingNumber: '' + scanedPackingNumber: '', + hintTitle:"" }; }, onLoad(option) { @@ -123,10 +124,12 @@ this.scanedPackingNumber = option.scaned || ''; if (this.type == 'predict') { this.switchCode = "SemiPutawayLocationCodeValidate" - updateTitle("预生产上架任务"); + this.hintTitle="预生产上架" + updateTitle("预生产上架详情"); } else if (this.type == 'assemble') { this.switchCode = "FgPutawayLocationCodeValidate" - updateTitle("装配上架任务"); + this.hintTitle="成品入库" + updateTitle("成品入库详情"); } if (this.id != undefined) { //新建的任务自动接收 @@ -456,7 +459,7 @@ productPutawayJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成制品上架记录
" + res.data) + this.showCommitSuccessMessage("提交成功
生成"+this.hintTitle+"记录
" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index f7475548..7e1e5d0a 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -185,7 +185,7 @@ if (this.type == 'predict') { updateTitle("预生产上架任务(" + this.totalCount + ")"); } else if (this.type == 'assemble') { - updateTitle("装配上架任务(" + this.totalCount + ")"); + updateTitle("成品入库任务(" + this.totalCount + ")"); } if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -202,7 +202,7 @@ if (this.type == 'predict') { updateTitle("预生产上架任务(" + this.totalCount + ")"); } else if (this.type == 'assemble') { - updateTitle("装配上架任务(" + this.totalCount + ")"); + updateTitle("成品入库任务(" + this.totalCount + ")"); } this.loadingType = ""; uni.hideLoading(); From 953349cddf78caa8a22c583c13164da1be6b9a69 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 09:28:03 +0800 Subject: [PATCH 12/58] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productPutaway/job/productPutawayDetail.vue | 1 + src/pages/productReceipt/job/fgProductReceiptDetail.vue | 3 ++- src/pages/productReceipt/job/productReceiptDetail.vue | 6 ++++-- src/pages/purchaseReceipt/job/receiptDetail.vue | 3 ++- src/pages/putaway/job/putawayDetail.vue | 1 + 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 682ee6d9..e12bb587 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -222,6 +222,7 @@ s.cancleScanedHiht = true // s.handleQty =s.qty this.openScanPopupSimulate(s) + this.scanedPackingNumber = '' } }) }) diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 7e1d2d5a..8eadbaea 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -232,9 +232,10 @@ r.subList.forEach(s => { if (this.scanedPackingNumber && this.scanedPackingNumber == s .packingNumber) { - s.scaned = true + s.scaned = true //模拟扫描功能 this.$refs.scanPopup.simulateScan(s); + this.scanedPackingNumber = '' } }) }) diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 3b269100..78b57831 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -226,12 +226,14 @@ that.detailSource.forEach(r => { r.subList.forEach(s => { if (this.scanedPackingNumber && this.scanedPackingNumber == s - .packingNumber){ + .packingNumber){ + s.scaned = true s.cancleScanedHiht = true s.copyContent = "HMQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty - this.$refs.scanPopup.simulateScan(s); + this.$refs.scanPopup.simulateScan(s); + this.scanedPackingNumber = '' // s.handleQty =s.qty } }) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index ab0eb84c..02117f25 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -238,7 +238,8 @@ s.cancleScanedHiht = true s.copyContent = "HPQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty - this.$refs.scanPopup.simulateScan(s); + this.$refs.scanPopup.simulateScan(s); + this.scanedPackingNumber = '' } }) }) diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 0a2513c8..cb004393 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -208,6 +208,7 @@ s.packList.forEach(item=>item.scaned = true) s.inventoryStatus = s.inspectResult; //更新检验结果状态 this.openScanPopupSimulate(s) + this.scanedPackingNumber = '' } }) From 1976767453631baa3c153d3a12aed6b0cfa09ffb Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 14:41:46 +0800 Subject: [PATCH 13/58] =?UTF-8?q?PDA=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=EF=BC=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9A=84=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/index.vue | 2 +- .../purchaseReceipt/job/receiptDetail.vue | 135 ++++++++++-------- 2 files changed, 77 insertions(+), 60 deletions(-) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index c4f721dc..d3ba15bc 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -387,7 +387,7 @@ console.log("包装规格获取失败", res) }) - var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate"; + var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA"; getSwitchByCode(switchCode).then(res=>{ uni.setStorageSync("switch", res.data) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 02117f25..7b69319c 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -73,7 +73,8 @@ getCurrDateTime, getPackingNumberAndBatch, compareAsc, - navigateBack + navigateBack, + getSwitchInfoByCode } from '@/common/basic.js'; import { @@ -134,7 +135,8 @@ isAllReceived: false, operation: '', scanedPackingNumber: '', - status:'' + status:'', + switchCode:'' }; }, @@ -143,7 +145,10 @@ this.id = option.id; this.scanedPackingNumber = option.scaned || ''; this.operation = option.operation; - this.status = option.status; + this.status = option.status; + this.switchCode = "purchasereceiptPrintPDA" + + }, onShow(){ @@ -471,60 +476,71 @@ if (res.success) { this.managementList = res.list; var params = this.setParams() - purchaseReceiptJobSubmit(params).then(res => { - if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录

将跳转到打印页面
" + res.data) - uni.showLoading({ - title: "提交成功,将跳转到打印页面", - mask: true - }); - - // 获取上架任务 - let timerCount = 0 - const timer1 = setInterval(async () => { - if (timerCount == 15) { - clearInterval(timer1) - uni.showToast({ - title: "跳转打印页面失败", - icon: "none" - }); - return; - } - await getPutawayJobList({ - filters: [{ - column: "purchaseReceiptRecordNumber", - action: "in", - value: res.data.number - }], - pageNo: 1, - pageSize: 1000, - }).then(res1 => { - timerCount = timerCount + 1 - if (res1.data && res1.data.list && res1.data - .list.length && (res1.data.total >= res - .data.detailCount)) { - uni.hideLoading() - clearInterval(timer1) - const dataParams = { - toLocationCode: res1.data.list[0] - .toLocationCode, - number: res1.data.list[0].number, - creator: res1.data.list[0].creator, - createTime: res1.data.list[0] - .createTime, - ids: res1.data.list.map(item => - item.masterId).join(',') - } - console.log(dataParams) - uni.navigateTo({ - url: '/pages/pointPutawayJob/index?data=' + - encodeURIComponent(JSON - .stringify(dataParams)) - }) - } - }) - }, 2000) - + purchaseReceiptJobSubmit(params).then(res => { + + + if (res.data) { + let isCheckPrint = getSwitchInfoByCode(this.switchCode) + if(!isCheckPrint){ + uni.hideLoading() + + this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data.number) + }else{ + uni.showLoading({ + title: "提交成功,将跳转到打印页面", + mask: true + }); + + // 获取上架任务 + let timerCount = 0 + const timer1 = setInterval(async () => { + if (timerCount == 15) { + clearInterval(timer1) + uni.showToast({ + title: "跳转打印页面失败", + icon: "none" + }); + return; + } + await getPutawayJobList({ + filters: [{ + column: "purchaseReceiptRecordNumber", + action: "in", + value: res.data.number + }], + pageNo: 1, + pageSize: 1000, + }).then(res1 => { + timerCount = timerCount + 1 + if (res1.data && res1.data.list && res1.data + .list.length && (res1.data.total >= res + .data.detailCount)) { + uni.hideLoading() + clearInterval(timer1) + const dataParams = { + toLocationCode: res1.data.list[0] + .toLocationCode, + number: res1.data.list[0].number, + creator: res1.data.list[0].creator, + createTime: res1.data.list[0] + .createTime, + ids: res1.data.list.map(item => + item.masterId).join(',') + } + console.log(dataParams) + uni.navigateTo({ + url: '/pages/pointPutawayJob/index?data=' + + encodeURIComponent(JSON + .stringify(dataParams)) + }) + } + }) + }, 2000) + + + } + + } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -677,9 +693,10 @@ }, - showCommitSuccessMessage(hint) { + showCommitSuccessMessage(hint) { + this.$refs.comMessage.showSuccessMessage(hint, res => { - // navigateBack(1) + navigateBack(1) }) }, } From 5ae6174b2ad5afa11b46c93e48f1340134058e64 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 16:52:37 +0800 Subject: [PATCH 14/58] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=BF=BB=E5=8C=85--?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=BA=93=E4=BD=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/httpRequest3.js | 1 + src/mycomponents/scan/winScanLocation.vue | 21 +- .../scan/winScanPackAndLocation.vue | 1023 +++++++++-------- .../package/record/overPackageRecord.vue | 22 +- src/store/modules/user.js | 1 + 5 files changed, 553 insertions(+), 515 deletions(-) diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js index e6714f5e..98afe0df 100644 --- a/src/api/httpRequest3.js +++ b/src/api/httpRequest3.js @@ -36,6 +36,7 @@ function service(options = {}) { }else { if(res.data.code==401){ uni.clearStorageSync() + uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位 removeToken(); uni.reLaunch({ url: '/pages/login/index' diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue index 24515c2e..8b0ae440 100644 --- a/src/mycomponents/scan/winScanLocation.vue +++ b/src/mycomponents/scan/winScanLocation.vue @@ -19,6 +19,8 @@ + + @@ -67,8 +69,15 @@ this.$refs.popup.open('bottom') }, 500) }, + openScanPopupSimulate(location) { + this.$refs.comscansimulate.setItemCodeSimulate(location) + this.$refs.comscansimulate.clickScanMsg(); + }, closeScanPopup() { - this.$refs.popup.close() + if(this.$refs.popup){ + this.$refs.popup.close() + } + }, scanClick() { this.$refs.scan.clickScanMsg(); @@ -77,6 +86,7 @@ this.$refs.scan.clearScanValue(); }, getScanResult(result) { + uni.showLoading({ title: '扫描中...', mask: true @@ -94,6 +104,7 @@ } getBasicLocationByCode(this.code).then(res => { + uni.hideLoading(); if (res.data.total > 0) { let result = res.data.list[0]; @@ -142,10 +153,14 @@ return isPass }, getfocus() { - this.$refs.scan.getfocus(); + if(this.$refs.scan){ + this.$refs.scan.getfocus(); + } }, losefocus() { - this.$refs.scan.losefocus(); + if(this.$refs.scan){ + this.$refs.scan.losefocus(); + } }, showErrorMessage(message) { setTimeout(r => { diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index fe64744a..96b0d9cf 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -1,507 +1,516 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index b066203f..228b3757 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -60,8 +60,8 @@ - - + + @@ -139,7 +139,7 @@ itemCode: "" }; }, - onLoad(option) { + onShow(){ var typeCode = "OverPackage" getBusinessType(typeCode, res => { if (res.success) { @@ -209,7 +209,10 @@ this.toPackQty = pack.packQty; this.toPackUnitShow = e[0].label }, - + //修改库位 + handleConfirm(fromLocationCode){ + this.$refs.scanLocationCode.openScanPopupSimulate(fromLocationCode) + }, getScanResult(result) { let balance = result.balance; let label = result.label; @@ -289,7 +292,13 @@ }, showFromLocationPopup() { this.$nextTick(() => { - this.$refs.scanLocationCode.openScanPopup(); + let overPackageRecord = uni.getStorageSync('overPackageRecord') + + if(overPackageRecord){ + this.$refs.scanLocationCode.openScanPopupSimulate(overPackageRecord) + }else{ + this.$refs.scanLocationCode.openScanPopup(); + } }) }, @@ -429,6 +438,9 @@ this.scanPopupGetFocus(); }, getLocation(location, code) { + if(code){ + uni.setStorageSync('overPackageRecord', code) + } this.getFromLocationCode(location, code) }, getFromLocationCode(location, code) { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 06a8cb07..509c9484 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -118,6 +118,7 @@ const user = { commit('SET_ID',[]) storage.removeStorage(storage.constant.token) storage.clearStorage() + uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位 resolve() }).catch(error => { reject(error) From 6f0c4917406361105d882d3616ca95b08f8dc030 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 19 Jun 2024 17:19:08 +0800 Subject: [PATCH 15/58] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hybrid/html/pointPutawayJob.html | 65 +++++++---- src/pages/pointPutawayJob/index.vue | 155 ++++++++++++++------------- 2 files changed, 124 insertions(+), 96 deletions(-) diff --git a/src/hybrid/html/pointPutawayJob.html b/src/hybrid/html/pointPutawayJob.html index 4b675aeb..06c908fc 100644 --- a/src/hybrid/html/pointPutawayJob.html +++ b/src/hybrid/html/pointPutawayJob.html @@ -15,8 +15,8 @@ mainBody - + \ No newline at end of file diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 6b717b21..41a82ecd 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -2,22 +2,28 @@ - + - 目标库位：{{data.toLocationCode}} + 目标库位：{{item.toLocationCode}} - - 任务编号：{{data.number}} + + + + 物料号：{{item.itemCode}} + + + 托包装号：{{item.packingNumber}} + - - 创建人：{{data.creator||''}} + + + 数量：{{item.packQty}}个 + - - 创建时间：{{formatDate(data.createTime)}} - +
${cur.batch} ${cur.packingNumber} ${cur.packUnit}${cur.packQty}${cur.qty} ${cur.uom}
- - - - - - - - - - tableTrTd -
物品代码物品描述批次包装号包装规格数量计量单位
-
- ` - let str1 = '' - this.data.sublist.forEach((cur, key) => { - str1 += ` - - ${cur.itemCode} - ${cur.itemDesc1} - ${cur.batch} - ${cur.packingNumber} - ${cur.packUnit} - ${cur.qty} - ${cur.uom} - ` - }) - str = str.replace( - "tableTrTd", str1) - // }) + }) this.newHtmlContent = this.newHtmlContent.replace( "mainBody", str); //替换物品代码 }); @@ -243,7 +216,7 @@ .box { font-size: 26rpx; /* display: flex; */ - padding: 20rpx; + /* padding: 20rpx; */ border: 1px solid #dedede; } @@ -301,16 +274,52 @@ .mb-kw { border-bottom: 1px solid #dedede; - padding-bottom: 20rpx; + padding: 20rpx; + font-size: 30rpx; } - .mb-kw text { + .mb-kw view { + font-weight: bold; + font-size: 46rpx; + text-align: center; + } + .mb-bo{ + display:flex; + } + .mb-bo .mb-left{ + flex:1 + + } + .mb-bo .mb-left .mb-text{ + padding: 20rpx; + } + .mb-bo .mb-left .mb-text:nth-child(1){ + border-bottom: 1px solid #dedede; + } + .mb-bo .mb-left .mb-text view{ font-weight: bold; font-size: 32rpx; + text-align: center; } - - .mb-text { + .mb-bo .mb-right{ + padding: 20rpx; + width: 260rpx; + border-left: 1px solid #dedede; + display: flex; + align-items: center; + } + .mb-bo .mb-right .mb-text{ + + width: 100%; + } + .mb-bo .mb-right .mb-text view{ + font-weight: bold; + font-size: 40rpx; + text-align: center; + width: 100%; + } +/* .mb-text { margin-top: 10rpx; } @@ -323,5 +332,5 @@ font-size: 24rpx !important; word-break: break-all; - } + } */ \ No newline at end of file From 37c5ed0c101f144260b1b7676df54fe12ad20960 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 19:43:41 +0800 Subject: [PATCH 16/58] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productPutaway/job/productPutawayJob.vue | 7 ++++++- src/pages/productReceipt/job/productReceiptJob.vue | 5 +++++ src/pages/purchaseReceipt/job/receiptJob.vue | 7 ++++++- src/pages/putaway/job/putawayJob.vue | 5 +++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index 7e1e5d0a..8bae64a0 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -347,7 +347,12 @@ column: "type", action: "==", value: this.type - }, + }, + { + column: "status", + action: "in", + value: '1,2', + } // { // column: "fromLocationCode", // action: "==", diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 51f49dd7..55a535ea 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -372,6 +372,11 @@ column: "type", action: "==", value: this.type + }, + { + column: "status", + action: "in", + value: '1,2', } // { // column: "fromLocationCode", diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index 677e643e..e46ac344 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -379,7 +379,12 @@ column: "itemCode", action: "==", value: result.label.itemCode - }, + }, + { + column: "status", + action: "in", + value: '1,2', + } // { // column: "fromLocationCode", // action: "==", diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index acf3f724..1a1db2ec 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -323,6 +323,11 @@ action: "==", value: result.label.itemCode }, + { + column: "status", + action: "in", + value: '1,2', + } // { // column: "fromLocationCode", // action: "==", From 1905bc71ae75d0b1d41afa68d0f4cd3dbba7cccc Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 20 Jun 2024 08:35:42 +0800 Subject: [PATCH 17/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8=E5=9C=A8=E9=80=94=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/coms/comScanIssuePack.vue | 23 ++++++ src/pages/issue/job/issueDetail.vue | 51 +++++++----- src/pages/issue/job/issueJob.vue | 80 +++++++++++++++++-- src/pages/issue/js/issue.js | 1 + .../package/job/overPackageJobDetail.vue | 30 +++---- .../job/productionReceiptDetail.vue | 45 ++++++++++- .../job/productionReceiptJob.vue | 74 ++++++++++++++++- src/pages/repleinsh/job/repleinshDetail.vue | 42 +++++----- 8 files changed, 282 insertions(+), 64 deletions(-) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index a94fea2d..09e5fe2a 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -95,6 +95,10 @@ + + + @@ -169,6 +173,25 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; this.scanOptions = getDetailEditRemoveOption(); }, methods: { + openScanPopupForJobSimulate(content, jobcontent) { + this.issueRecord = []; + this.dataContent = content; + this.jobContent = jobcontent; + this.initData(); + // this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + + // "-" + this.jobContent.subList[0].workStationCode + if (this.$refs.comscansimulate != undefined) { + this.$refs.comscansimulate.getfocus(); + } + let timer = setTimeout(res => { + if(timer){ + clearTimeout(timer) + } + this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent) + this.$refs.comscansimulate.clickScanMsg(); + }, 500) + }, + openScanPopup(content, jobcontent) { this.issueRecord = []; this.dataContent = content; diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 9c75f0f4..4d0c0c1e 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -96,7 +96,8 @@ detailSource: [], //绑定在页面上的数据源 detailOptions: [], scanOptions: [], - jobStatus: "" + jobStatus: "", + scanedPackingNumber: '' }; }, @@ -106,6 +107,7 @@ onLoad(option) { this.id = option.id; + this.scanedPackingNumber = option.scaned || ''; if (this.id != undefined) { //新建的任务自动接收 if (option.status == "1") { @@ -199,8 +201,19 @@ setTimeout(r => { that.resizeCollapse(); }, 100) + // that.detailSource.forEach(r => { + // r.subList.forEach(s => { + // if (this.scanedPackingNumber && this.scanedPackingNumber == s + // .packingNumber) { + // s.scaned = true + // s.cancleScanedHiht = true + // //模拟扫描功能 + // this.openScanPopupSimulate(s); + // this.scanedPackingNumber = '' + // } + // }) + // }) - uni.hideLoading(); } else { that.showMessage('列表数据为0'); } @@ -258,22 +271,18 @@ itemCodes.push(item.itemCode) }) }) + + //获取管理模式，封装参数 + getManagementPrecisions(itemCodes, locationCode, res => { + if (res.success) { + this.managementList = res.list; + this.submitJob(); + } else { + uni.hideLoading(); + this.showErrorMessage(res.message); + } + }); - //使用在途库，不查询管理模式 - if (this.jobContent.useOnTheWayLocation == 'TRUE') { - this.submitJob(); - } else { - //获取管理模式，封装参数 - getManagementPrecisions(itemCodes, locationCode, res => { - if (res.success) { - this.managementList = res.list; - this.submitJob(); - } else { - uni.hideLoading(); - this.showErrorMessage(res.message); - } - }); - } }, submitJob() { @@ -337,8 +346,7 @@ record.amount = single_price * r.qty; //使用在途库不改变管理模式 - if (this.jobContent - .useOnTheWayLocation == 'TRUE') { + if (item.onTheWayLocationCode) { record.toPackingNumber = r .packingNumber; record.toBatch = r.batch; @@ -511,6 +519,11 @@ // Object.assign(datacontent, this.detailSource); this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent); }, + + // openScanPopupSimulate(){ + // this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent); + // }, + closeScanPopup() { this.updateCommitBtn(); }, diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 2010a270..ae213226 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -21,6 +21,9 @@ + + + @@ -45,6 +48,9 @@ import comIssueJobCard from '@/pages/issue/coms/comIssueJobCard.vue' import jobListPopup from '@/pages/issue/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/issue/coms/jobInfoPopup.vue' + import winScanButton from '@/mycomponents/scan/winScanButton.vue' + import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue" + import jobList from '@/mycomponents/jobList/jobList.vue' export default { name: 'issue', @@ -53,7 +59,10 @@ jobFilter, comIssueJobCard, jobListPopup, - jobInfoPopup + jobInfoPopup, + winScanPackJob, + winScanButton, + jobList }, data() { return { @@ -223,9 +232,10 @@ }, - openJobDetail(item) { + openJobDetail(item, packingNumber = '') { uni.navigateTo({ - url: './issueDetail?id=' + item.masterId + '&status=' + item.status + url: './issueDetail?id=' + item.masterId + '&status=' + item.status+'&scaned=' + + packingNumber }); }, @@ -236,6 +246,11 @@ selectedItem(item) { this.openJobDetail(item); }, + + selectItem(item) { + this.$refs.scanPopup.closeScanPopup(); + this.openJobDetail(item,item.packingNumber); + }, swipeClick(e, dataContent) { if (e.content.text == "详情") { @@ -306,8 +321,6 @@ filters: filters, pageNo: 1, pageSize: 100, - sort: 'fromLocationCode', - by: 'asc' } getIssueJobList(params).then(res => { uni.hideLoading(); @@ -329,6 +342,63 @@ } }); }, + openScanPopup() { + this.$refs.scanPopup.openScanPopup(); + }, + getScanResult(result) { + try { + var filters = [ + { + column: "status", + action: "in", + value: '1,2' + }, + { + column: "batch", + action: "==", + value: result.label.batch + }, + { + column: "itemCode", + action: "==", + value: result.label.itemCode + } + ] + getIssueJobList({ + filters: filters, + pageNo: 1, + pageSize: 100, + sort: 'createTime', + by: 'asc' + }).then(res => { + let resultList = res.data.list; + if (resultList.length > 0) { + resultList.forEach(item => { + item.title = item.number; + item.selected = false + }) + let list = [] + resultList.forEach(item=>{ + if(!list.find(subItem=>subItem.title==item.title)){ + list.push(item) + } + }) + if (list.length > 1) { + this.$refs.jobList.openList(list) + } else { + this.selectItem(list[0]) + } + } else { + this.showMessage('未查找到任务') + } + }).catch(error => { + this.showMessage(error) + }) + + } catch (e) { + this.showMessage(e.message) + } + }, } } diff --git a/src/pages/issue/js/issue.js b/src/pages/issue/js/issue.js index 696ff895..97b8b8b5 100644 --- a/src/pages/issue/js/issue.js +++ b/src/pages/issue/js/issue.js @@ -53,6 +53,7 @@ export function createItemInfo(detail) { let item = { itemCode: detail.itemCode, itemName: detail.itemName, + onTheWayLocationCode:detail.onTheWayLocationCode, productionLineCode: detail.productionLineCode, workStationCode: detail.workStationCode, packQty: detail.packQty, diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 2cb32dd4..5c0c95c1 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -272,22 +272,24 @@ itemCodes.push(item.itemCode) }) }) + + this.checkSubmit(); //使用在途库，不查询管理模式 - if (this.jobContent.useOnTheWayLocation == 'TRUE') { - this.checkSubmit(); - } else { - //获取管理模式，封装参数 - getManagementPrecisions(itemCodes, locationCode, res => { - if (res.success) { - this.managementList = res.list; - this.checkSubmit(); - } else { - uni.hideLoading(); - this.showErrorMessage(res.message); - } - }); - } + // if (this.jobContent.useOnTheWayLocation == 'TRUE') { + // this.checkSubmit(); + // } else { + // //获取管理模式，封装参数 + // getManagementPrecisions(itemCodes, locationCode, res => { + // if (res.success) { + // this.managementList = res.list; + // this.checkSubmit(); + // } else { + // uni.hideLoading(); + // this.showErrorMessage(res.message); + // } + // }); + // } }, checkSubmit() { var tempHandleQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].handleQty diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index 22c626ea..a2762da0 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -109,11 +109,13 @@ toLocationAreaTypeList: [], jobStatus: "", jobToLocationCode: "", - isCheckLocation: false + isCheckLocation: false, + scanedPackingNumber: '' }; }, onLoad(option) { this.id = option.id; + this.scanedPackingNumber = option.scaned || ''; if (this.id != undefined) { //新建的任务自动接收 if (option.status == "1") { @@ -191,6 +193,20 @@ } else { that.toLocationCode = that.jobToLocationCode; } + that.detailSource.forEach(r => { + r.subList.forEach(s => { + if (this.scanedPackingNumber && this.scanedPackingNumber == s + .packingNumber) { + s.scaned = true + s.cancleScanedHiht = true + //模拟扫描功能 + this.openScanPopupSimulate(s); + this.scanedPackingNumber = '' + } + }) + }) + + } else { that.showMessage('列表数据为0'); } @@ -251,6 +267,31 @@ this.$refs.scanPopup.closeScanPopup(); }, + //模拟扫描功能 + openScanPopupSimulate(item) { + + let fromlocationCode = ''; + let fromlocationList = []; + for (var i = 0; i < this.detailSource.length; i++) { + let item = this.detailSource[i]; + item.subList.forEach(l => { + //重复的库位不往里面插入 + var location = fromlocationList.find(res => res == l.fromLocationCode) + if (location == undefined) { + fromlocationList.push(l.fromLocationCode); + } + //来源库位赋默认值 + if (fromlocationCode == '') { + if (!l.scaned) { + fromlocationCode = l.fromLocationCode; + } + } + }) + } + this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent, + item); + }, + getScanResult(result) { try { // var supplierCode = result.label.supplierCode; @@ -278,7 +319,7 @@ this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode + "]不在列表中") } else { - if (itemDetail.scaned) { + if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) { this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode + "]已经扫描") } else { diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index 5a660cf8..7c06df09 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -22,6 +22,9 @@ + + + @@ -48,6 +51,9 @@ import comProductionJobCard from '@/pages/productionReceipt/coms/comProductionJobCard.vue' import jobListPopup from '@/pages/productionReceipt/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/productionReceipt/coms/jobInfoPopup.vue' + import winScanButton from '@/mycomponents/scan/winScanButton.vue' + import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue" + import jobList from '@/mycomponents/jobList/jobList.vue' export default { name: 'productionReceipt', @@ -56,7 +62,10 @@ jobFilter, comProductionJobCard, jobListPopup, - jobInfoPopup + jobInfoPopup, + winScanPackJob, + winScanButton, + jobList }, data() { return { @@ -177,9 +186,10 @@ }) }, - openJobDetail(item) { + openJobDetail(item, packingNumber = '') { uni.navigateTo({ - url: './productionReceiptDetail?id=' + item.masterId + '&status=' + item.status + url: './productionReceiptDetail?id=' + item.masterId + '&status=' + item.status+'&scaned=' + + packingNumber }); }, @@ -280,6 +290,64 @@ } }); }, + openScanPopup() { + this.$refs.scanPopup.openScanPopup(); + }, + selectItem(item) { + this.$refs.scanPopup.closeScanPopup(); + this.openJobDetail(item,item.packingNumber); + }, + getScanResult(result) { + try { + var filters = [{ + column: "packingNumber", + action: "==", + value: result.label.packingNumber + }, + { + column: "batch", + action: "==", + value: result.label.batch + }, + { + column: "itemCode", + action: "==", + value: result.label.itemCode + } + ] + getProductionReceiptJobList({ + filters: filters, + pageNo: 1, + pageSize: 100, + }).then(res => { + let resultList = res.data.list; + if (resultList.length > 0) { + resultList.forEach(item => { + item.title = item.number; + item.selected = false + }) + let list = [] + resultList.forEach(item=>{ + if(!list.find(subItem=>subItem.title==item.title)){ + list.push(item) + } + }) + if (list.length > 1) { + this.$refs.jobList.openList(list) + } else { + this.selectItem(list[0]) + } + } else { + this.showMessage('未查找到任务') + } + }).catch(error => { + this.showMessage(error) + }) + + } catch (e) { + this.showMessage(e.message) + } + }, } } diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 53ec9d9d..f1d1416c 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -227,12 +227,12 @@ // this.setSubmitParamsAndSubmit(); // } // } else { - //不允许部分提交，扫描数必须等于任务数量才可以提交 - if (scanCount == 0) { - this.showErrorMessage("扫描数为0,请先扫描") - } else { - this.setSubmitParamsAndSubmit(); - } + //不允许部分提交，扫描数必须等于任务数量才可以提交 + if (scanCount == 0) { + this.showErrorMessage("扫描数为0,请先扫描") + } else { + this.setSubmitParamsAndSubmit(); + } // } }, @@ -245,22 +245,22 @@ itemCodes.push(item.itemCode) }) }) - + this.submitJob(); //使用在途库，不查询管理模式 - if (this.jobContent.useOnTheWayLocation == 'TRUE') { - this.submitJob(); - } else { - //获取管理模式，封装参数 - getManagementPrecisions(itemCodes, locationCode, res => { - if (res.success) { - this.managementList = res.list; - this.submitJob(); - } else { - uni.hideLoading(); - this.showErrorMessage(res.message); - } - }); - } + // if (this.jobContent.useOnTheWayLocation == 'TRUE') { + // this.submitJob(); + // } else { + // //获取管理模式，封装参数 + // getManagementPrecisions(itemCodes, locationCode, res => { + // if (res.success) { + // this.managementList = res.list; + // this.submitJob(); + // } else { + // uni.hideLoading(); + // this.showErrorMessage(res.message); + // } + // }); + // } }, submitJob() { From bd90f6eb94e71a1d251f2417bc876b723979c371 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 20 Jun 2024 10:06:56 +0800 Subject: [PATCH 18/58] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/jobList/jobList.vue | 4 ++-- src/mycomponents/scan/winComScan.vue | 1 + src/pages/issue/coms/comScanIssuePack.vue | 4 ++-- src/pages/issue/job/issueDetail.vue | 17 ++++++++++++----- src/pages/issue/job/issueJob.vue | 15 ++++++++------- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/mycomponents/jobList/jobList.vue b/src/mycomponents/jobList/jobList.vue index 1d966802..d25588cc 100644 --- a/src/mycomponents/jobList/jobList.vue +++ b/src/mycomponents/jobList/jobList.vue @@ -38,10 +38,10 @@ import { onShow } from '@dcloudio/uni-app'; methods:{ openList(list){ this.list = list - this.$refs.listPopup.open('center') }, selectItem(item,index){ + this.$refs.listPopup.close(); this.$emit("selectItem", item); } } @@ -55,7 +55,7 @@ import { onShow } from '@dcloudio/uni-app'; align-items: center; .list{ width: 80%; - max-height:80vh; + max-height:50vh; overflow-y: auto; border-radius: 10px !important; .slot-image{ diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue index 63b5b193..481aa733 100644 --- a/src/mycomponents/scan/winComScan.vue +++ b/src/mycomponents/scan/winComScan.vue @@ -205,6 +205,7 @@ getLabelInfo(content, this.headerType, callback => { // uni.hideLoading(); let scanResult = callback; + scanResult.scanMessage=content if (scanResult.success) { that.clear(); // that.getfocus();//不能自动获取焦点 diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 09e5fe2a..938f2632 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -173,7 +173,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; this.scanOptions = getDetailEditRemoveOption(); }, methods: { - openScanPopupForJobSimulate(content, jobcontent) { + openScanPopupForJobSimulate(content, jobcontent,scanMessage) { this.issueRecord = []; this.dataContent = content; this.jobContent = jobcontent; @@ -187,7 +187,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; if(timer){ clearTimeout(timer) } - this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent) + this.$refs.comscansimulate.setItemCodeSimulate(scanMessage) this.$refs.comscansimulate.clickScanMsg(); }, 500) }, diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 4d0c0c1e..960b38c0 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -97,7 +97,7 @@ detailOptions: [], scanOptions: [], jobStatus: "", - scanedPackingNumber: '' + scanMessage: '' }; }, @@ -107,7 +107,7 @@ onLoad(option) { this.id = option.id; - this.scanedPackingNumber = option.scaned || ''; + this.scanMessage = option.scanMessage || ''; if (this.id != undefined) { //新建的任务自动接收 if (option.status == "1") { @@ -198,6 +198,12 @@ that.subList = res.data.subList; that.detailSource = getDataSource(that.detailSource, that.subList) + + //任务中已经扫描，模拟扫描赋值 + if(this.scanMessage){ + this.openScanPopupSimulate(this.scanMessage); + + } setTimeout(r => { that.resizeCollapse(); }, 100) @@ -435,6 +441,7 @@ }, afterScan() { + this.resizeCollapse(); this.detailSource.forEach(detail => { let s = ''; detail.Items.forEach(item => { @@ -520,9 +527,9 @@ this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent); }, - // openScanPopupSimulate(){ - // this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent); - // }, + openScanPopupSimulate(scanMessage){ + this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent,scanMessage); + }, closeScanPopup() { this.updateCommitBtn(); diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index ae213226..c8b086ed 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -21,7 +21,7 @@ - + @@ -232,10 +232,10 @@ }, - openJobDetail(item, packingNumber = '') { + openJobDetail(item, scanMessage = '') { uni.navigateTo({ - url: './issueDetail?id=' + item.masterId + '&status=' + item.status+'&scaned=' + - packingNumber + url: './issueDetail?id=' + item.masterId + '&status=' + item.status+'&scanMessage=' + + scanMessage }); }, @@ -249,7 +249,7 @@ selectItem(item) { this.$refs.scanPopup.closeScanPopup(); - this.openJobDetail(item,item.packingNumber); + this.openJobDetail(item,this.scanMessage); }, swipeClick(e, dataContent) { @@ -371,6 +371,7 @@ sort: 'createTime', by: 'asc' }).then(res => { + this.scanMessage =result.scanMessage let resultList = res.data.list; if (resultList.length > 0) { resultList.forEach(item => { @@ -386,10 +387,10 @@ if (list.length > 1) { this.$refs.jobList.openList(list) } else { - this.selectItem(list[0]) + this.selectItem(list[0],scanMessage) } } else { - this.showMessage('未查找到任务') + this.showMessage("物料号+["result.label.itemCode+"]批次["+result.label.batch+']未查找到任务') } }).catch(error => { this.showMessage(error) From 4b0d6857e9f46308597cd9d8f23ef936bae92f2d Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 20 Jun 2024 11:14:15 +0800 Subject: [PATCH 19/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueJob.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index c8b086ed..e552b08b 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -390,7 +390,7 @@ this.selectItem(list[0],scanMessage) } } else { - this.showMessage("物料号+["result.label.itemCode+"]批次["+result.label.batch+']未查找到任务') + this.showMessage("物料号["+result.label.itemCode+"]批次["+result.label.batch+']未查找到任务') } }).catch(error => { this.showMessage(error) From 5202489224228e5acab93c407c95ca51481ef311 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 20 Jun 2024 13:22:38 +0800 Subject: [PATCH 20/58] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hybrid/html/point.html | 24 +++++++----- src/pages/point/index.vue | 40 ++++++-------------- src/pages/purchaseReceipt/job/receiptJob.vue | 2 +- 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/src/hybrid/html/point.html b/src/hybrid/html/point.html index bd147d80..82a76ddb 100644 --- a/src/hybrid/html/point.html +++ b/src/hybrid/html/point.html @@ -17,6 +17,7 @@ .box { font-size: 14px; display: flex; + margin-top: 60px; } @@ -35,38 +36,41 @@ border-right: 1px solid #b1b1b1; width: 60px; padding: 0px 5px; - height: 67px; - line-height: 67px; + height: 58px; + line-height: 58px; } .value { border-bottom: 1px solid #b1b1b1; border-right: 1px solid #b1b1b1; padding: 0px 5px; - height: 67px; + height: 58px; flex: 1; width: 0px; display: flex; align-items: center; - word-wrap: break-word; + word-break: break-all; } .right { - width: 200px; + width: 300px; } .image { - width: 100%; - height: 202px; + width: calc(100% - 1px); + height: 176px; border-bottom: 1px solid #b1b1b1; border-top: 1px solid #b1b1b1; border-right: 1px solid #b1b1b1; } .image img { - width: calc(100% - 4px); - height: calc(100% - 4px); - margin: 2px; + width: 172px; + height: 172px; + border: 1px solid #b1b1b1; + /* width: calc(100% - 4px); + height: calc(100% - 4px); */ + margin: 1px; } diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue index 62bbe201..33d42430 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -185,35 +185,19 @@ async onShow() { // 获取数据 // this.data = [{ - // itemNumber: '555555', - // itemName: 'hahah', - // referenceOrderRow: '55', - // referenceOrderCode: '55', - // supplierCode: '555', - // packageCode: '9999-8888', - // amount: '55', + // itemCode:'065.051-01M', // 物品代码 + // itemName: 'PCCLARNATEA1225BLACK9999', // 物品名称 + // packName: '包装名称',// 包装名称 + // packageCode: 'PS0513-000003', // 包装号 + // batch:'20240514',//批次 + // parentNumber:'PS0513-000003',//父包装号 + // itemType:'物料类型',//物料类型 + // asnNumber:'123232',//ASN + // supplierCode: 'Fewewq', // 供应商 + // qty: '100', // 数量 + // printTimes:'2019-09-09 09:09:00', // 打印时间 // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;', // barcodeBase64: '' - // }, { - // itemNumber: '66', - // itemName: 'hahah', - // referenceOrderRow: '66', - // referenceOrderCode: '666', - // supplierCode: '66', - // packageCode: '66666', - // amount: '666666', - // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;', - // barcodeBase64: '' - // }, { - // itemNumber: '66', - // itemName: 'hahah', - // referenceOrderRow: '66', - // referenceOrderCode: '666', - // supplierCode: '66', - // packageCode: '66666', - // amount: '666666', - // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;', - // barcodeBase64: '' // }] this.$nextTick(async () => { // 获取二维码图片临时路径 @@ -280,7 +264,7 @@ width: 0px; display: flex; align-items: center; - word-wrap: break-word; + word-break: break-all; } .right { diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index e46ac344..e79aa364 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -20,7 +20,7 @@ - + From ac927c3d6012978bdd195cf30e783445fad7dac1 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 20 Jun 2024 13:38:17 +0800 Subject: [PATCH 21/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueJob.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index e552b08b..537d5c72 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -387,7 +387,7 @@ if (list.length > 1) { this.$refs.jobList.openList(list) } else { - this.selectItem(list[0],scanMessage) + this.selectItem(list[0]) } } else { this.showMessage("物料号["+result.label.itemCode+"]批次["+result.label.batch+']未查找到任务') From c9417c7149aa4f2b27802704fa8f000594c8db0d Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 20 Jun 2024 14:46:12 +0800 Subject: [PATCH 22/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/coms/comScanIssuePack.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 938f2632..f9310b66 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -528,10 +528,16 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; }, packGetFocus() { - this.$refs.comscan.getfocus(); + if(this.$refs.comscan){ + this.$refs.comscan.getfocus(); + } + }, packLoseFocus() { - this.$refs.comscan.losefocus(); + if(this.$refs.comscan){ + this.$refs.comscan.losefocus(); + } + }, showMessage(message, callback) { setTimeout(r => { From 0eb636595809f5f1c8e39a87a44efdf01b1fe9b9 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 20 Jun 2024 15:11:05 +0800 Subject: [PATCH 23/58] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9F=A5=E8=AF=A2=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=9C=A8=E5=90=8E=E7=AB=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/productionReceiptDetail.vue | 73 +++++++++++-------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index a2762da0..a65e7ab5 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -428,33 +428,48 @@ title: "提交中....", mask: true }); - var itemCodes = [] - this.detailSource.forEach(item => { - itemCodes.push(item.itemCode) - }) - - getManagementPrecisions(itemCodes, this.toLocationCode, res => { - if (res.success) { - this.managementList = res.list; - var params = this.setParams() - console.log("提交参数", JSON.stringify(params)); - - productionReceiptJobSubmit(params).then(res => { - uni.hideLoading() - if (res.data) { - this.showCommitSuccessMessage("提交成功
生成发料接收记录
" + res.data) - } else { - this.showErrorMessage("提交失败[" + res.msg + "]") - } - }).catch(error => { - uni.hideLoading() - this.showErrorMessage(error) - }) + var params = this.setParams() + console.log("提交参数", JSON.stringify(params)); + productionReceiptJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成发料接收记录
" + res.data) } else { - uni.hideLoading(); - this.showErrorMessage(res.message); + this.showErrorMessage("提交失败[" + res.msg + "]") } - }); + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) + + + // var itemCodes = [] + // this.detailSource.forEach(item => { + // itemCodes.push(item.itemCode) + // }) + + // getManagementPrecisions(itemCodes, this.toLocationCode, res => { + // if (res.success) { + // this.managementList = res.list; + // var params = this.setParams() + // console.log("提交参数", JSON.stringify(params)); + + // productionReceiptJobSubmit(params).then(res => { + // uni.hideLoading() + // if (res.data) { + // this.showCommitSuccessMessage("提交成功
生成发料接收记录
" + res.data) + // } else { + // this.showErrorMessage("提交失败[" + res.msg + "]") + // } + // }).catch(error => { + // uni.hideLoading() + // this.showErrorMessage(error) + // }) + // } else { + // uni.hideLoading(); + // this.showErrorMessage(res.message); + // } + // }); }, setParams() { @@ -464,10 +479,10 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { - var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, - detail.packingNumber, detail.batch); - detail.toPackingNumber = info.packingNumber; - detail.toBatch = info.batch; + // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, + // detail.packingNumber, detail.batch); + detail.toPackingNumber = detail.packingNumber; + detail.toBatch = detail.batch; detail.toContainerNumber = ""; detail.toLocationCode = this.toLocationCode; subList.push(detail) From 67d891f59a691878789a6ae084a52e56baf5fb8d Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 20 Jun 2024 16:22:47 +0800 Subject: [PATCH 24/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=85=E9=85=8D?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=89=93=E5=8D=B0=E8=BF=94=E5=9B=9E=E5=88=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productReceipt/job/fgProductReceiptDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 8eadbaea..e23aeb3f 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -400,7 +400,7 @@ }) console.log('pointData', pointData) - uni.navigateTo({ + uni.redirectTo({ url: `/pages/pointProductReceipt/index?points=${JSON.stringify(pointData)}` }); @@ -432,7 +432,7 @@ token: storage.getStorage(storage.constant.token), asn_number: resLable.data } - uni.navigateTo({ + uni.redirectTo({ url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` }); }) From e5db860c41ea57c9b2261d6051812002b47415a7 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 21 Jun 2024 10:05:16 +0800 Subject: [PATCH 25/58] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/job/jobFilter.vue | 2 +- src/pages/purchaseReceipt/job/receiptJob.vue | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 2ef38ac8..8ebbfc81 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -28,7 +28,7 @@ 来源库位 - diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index e79aa364..455dfe9f 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -348,7 +348,12 @@ this.$refs.scanPopup.closeScanPopup(); this.openJobDetail(item, item.packingNumber); }, - getScanResult(result) { + getScanResult(result) { + + if(result.scanMessage.indexOf('ASN')>-1){ + this.showMessage('请扫描箱标签') + return + } try { let filters = [] From 60c07403e4beca114bc322e41d733b5dd081ceaa Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 21 Jun 2024 10:42:46 +0800 Subject: [PATCH 26/58] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1--=E6=89=AB=E6=8F=8FASN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/jobList/jobList.vue | 8 ++++--- src/pages/purchaseReceipt/job/receiptJob.vue | 25 +++++++++++--------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/mycomponents/jobList/jobList.vue b/src/mycomponents/jobList/jobList.vue index d25588cc..460c590c 100644 --- a/src/mycomponents/jobList/jobList.vue +++ b/src/mycomponents/jobList/jobList.vue @@ -26,6 +26,7 @@ import { onShow } from '@dcloudio/uni-app'; }, data() { return { + isScanedASN:false, list: [] // [{ // title:'哈哈哈哈', @@ -36,13 +37,14 @@ import { onShow } from '@dcloudio/uni-app'; props: { }, methods:{ - openList(list){ - this.list = list + openList(list,isScanedASN=false){ + this.list = list; + this.isScanedASN = isScanedASN; this.$refs.listPopup.open('center') }, selectItem(item,index){ this.$refs.listPopup.close(); - this.$emit("selectItem", item); + this.$emit("selectItem", item,this.isScanedASN); } } } diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index 455dfe9f..f2709948 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -20,7 +20,7 @@ - + @@ -344,16 +344,19 @@ openScanPopup() { this.$refs.scanPopup.openScanPopup(); }, - selectItem(item) { - this.$refs.scanPopup.closeScanPopup(); - this.openJobDetail(item, item.packingNumber); + selectItem(item,isScanedASN=false) { + + this.$refs.scanPopup.closeScanPopup(); + if(isScanedASN){ + this.openJobDetail(item) + }else{ + ; + this.openJobDetail(item, item.packingNumber); + } + }, getScanResult(result) { - - if(result.scanMessage.indexOf('ASN')>-1){ - this.showMessage('请扫描箱标签') - return - } + try { let filters = [] @@ -419,9 +422,9 @@ console.log('list', list) if (list.length > 1) { - this.$refs.jobList.openList(list) + this.$refs.jobList.openList(list,result.scanMessage.indexOf('ASN')>-1) } else { - this.selectItem(list[0]) + this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1) } } else { this.showMessage('未查找到任务') From c178901d52bafea6377b13302a2e41945c9b9df4 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 21 Jun 2024 16:27:52 +0800 Subject: [PATCH 27/58] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF--=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 8 ++++++++ src/mycomponents/job/jobFilter.vue | 10 ++++++++-- src/pages/issue/job/issueJob.vue | 27 ++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/api/request2.js b/src/api/request2.js index 2e0612ad..7fe6ba1b 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -1314,6 +1314,14 @@ export function getIssueJobList(params) { data: params, }); } +export function getIssueJobByProductionline() { + return request({ + url: baseApi + "/wms/issue-job-main/getIssueJobByProductionline", + method: "get", + data: {}, + }); +} + /** * 发料任务明细 * @param {*} 任务id diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 8ebbfc81..9aa2fff2 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -21,8 +21,10 @@ 生产线 - + + + @@ -92,6 +94,10 @@ type: Boolean, default: false }, + productionline:{ + type: Array, + default: [] + } }, data() { return { diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 537d5c72..2962ec2f 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -1,7 +1,7 @@