From 556dbfbbe61eacd7f832845dfe4e263ae9ef8e19 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 13 Jun 2024 18:40:55 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E8=A1=A5=E6=96=99=E8=AF=A6=E6=83=85--?= =?UTF-8?q?=E7=BC=96=E8=BE=91--=E8=AE=A1=E7=AE=97=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/coms/comScanReplishPack.vue | 2 +- src/pages/repleinsh/job/repleinshDetail.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index 43ca82bc..5e8eda57 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -185,7 +185,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; let that = this; that.fromLocationList = []; if (that.dataContent != null) { - that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) + that.fromInventoryStatuses = this.jobContent.outInventoryStatuses that.toLocation = that.dataContent[0]; that.toLocationCode = that.dataContent[0].toLocationCode; that.fromLocationList = that.getFromLocationList(); diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index f51b51c2..53ec9d9d 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -413,6 +413,7 @@ }) batch.handleQty = handleQty; itemHandleQty = calc.add(itemHandleQty, handleQty) + this.$refs.comScanIssuePack.calcBatchHandleQty(batch) } }) } From 93e7e4a6a6d94e2f89ba1c908019b17c1aa564fa Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 13 Jun 2024 19:49:26 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/location/locationCompare.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue index 9d44998e..aba61626 100644 --- a/src/mycomponents/location/locationCompare.vue +++ b/src/mycomponents/location/locationCompare.vue @@ -7,18 +7,18 @@ - {{title}} + {{title}} -   {{recommendLocationCode}} -  / {{locationCode}} +   {{recommendLocationCode}} +  / {{locationCode}} - {{title}} -   {{recommendLocationCode}} + {{title}} +   {{recommendLocationCode}} From 200950c993e02a1c5a2fe8c254694604655a440f Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 15:09:56 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BD=99=E9=A2=9D--=E5=A4=A7=E5=93=A5=E8=AE=A9=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=20fromInventoryStatuses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winScanPackAndLocation.vue | 7 ++++++- src/pages/productPutaway/job/productPutawayDetail.vue | 2 +- src/pages/productPutaway/record/productPutawayRecord.vue | 2 +- src/pages/putaway/job/putawayDetail.vue | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index d8181552..c9e05933 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -105,6 +105,10 @@ queryBalance: { type: Boolean, default: true + }, + balanceFromInventoryStatuses:{//是否传fromInventoryStatuses + type: Boolean, + default: true } }, data() { @@ -255,7 +259,8 @@ // title: '查询中...', // mask: true // }) - getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses, + // 采购上架任务--大哥让去掉 fromInventoryStatuses + getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.balanceFromInventoryStatuses?this.fromInventoryStatuses:undefined, res => { uni.hideLoading(); if (res.success) { diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 0ae80cc1..c4c53f0f 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -36,7 +36,7 @@ - + diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index 4cb454b3..820d4a28 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -33,7 +33,7 @@ - + diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 64db0566..78542323 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -41,7 +41,7 @@ - + From ea668e5b30eac57e570d2130948d012b464b9966 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 14 Jun 2024 16:01:23 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 4 +- src/pages/issue/record/directIssue.vue | 129 +++--- src/pages/issue/record/directIssue1.vue | 557 ++++++++++++++++++++++++ src/pages/login/index.vue | 2 +- 4 files changed, 611 insertions(+), 81 deletions(-) create mode 100644 src/pages/issue/record/directIssue1.vue diff --git a/src/manifest.json b/src/manifest.json index 49401d07..c676b8f7 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "wms", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.0", - "versionCode" : 1, + "versionName" : "1.0.5", + "versionCode" : 5, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index 4d552454..1bcb962f 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -14,10 +14,12 @@ - - + + @@ -75,7 +77,8 @@ getBusinessType, createItemInfo, createDetailInfo, - calcTreeHandleQty + calcTreeHandleQty, + calcHandleQty } from '@/common/record.js'; import { @@ -170,6 +173,8 @@ let balance = result.balance; let label = result.label; let pack = result.package; + let packUnit = pack.packUnit; + let packQty =pack.packQty var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) { return res @@ -179,37 +184,36 @@ this.fromWarehouseCode = balance.warehouseCode; } if (item == undefined) { - // 获取推荐库位 - // this.getRecommendLocation(balance, pack, toLocation => { - var itemp = createItemInfo(balance, pack); - let newDetail = createDetailInfo(balance, pack); // - // newDetail.toLocationCode = toLocation.code; - // newDetail.toWarehouseCode = toLocation.warehouseCode; - itemp.subList.push(newDetail); - var dataList = pack.subList - this.detailSource.push(itemp) - this.detailSource.forEach(res => { - res.subList.forEach(pack => { - pack.packList = dataList.filter(c => c.parentNumber == pack - .packingNumber) - pack.packList.forEach(pac => { - pac.parentPackingNumber = pac.parentNumber; - pac.packingNumber = pac.number; - pac.inventoryStatus = "OK"; - pac.scaned = true; - }) - }) - }) - // }) - + + var itemp = createItemInfo(balance, pack); + let newDetail = createDetailInfo(balance, pack); // + newDetail.packUnit =packUnit; + newDetail.packQty=packQty; + itemp.subList.push(newDetail); + this.detailSource.push(itemp) + calcHandleQty(this.detailSource); + } else { - var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch == - balance.batch); - if (itemDetail != undefined) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + var detail = item.subList.find(r => { + if (r.packingNumber == balance.packingNumber && + r.batch == balance.batch && + r.locationCode == balance.locationCode && + r.inventoryStatus == balance.inventoryStatus) { + return r; + } + }) + if (detail == undefined) { + let newDetail = createDetailInfo(balance, pack); + newDetail.packUnit =packUnit; + newDetail.packQty=packQty; + item.subList.push(newDetail); + calcHandleQty(this.detailSource); + } else { + if (detail.scaned == true) { + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + } } } - // calcTreeHandleQty(this.detailSource); }, //获取推荐库位 @@ -318,12 +322,6 @@ }, - - - updateData() { - this.calcTreeHandleQty(); - }, - removeItem(index, item) { this.detailSource.splice(index, 1) }, @@ -403,38 +401,6 @@ }); }, - - getItemAndLocationRelations() { - var itemList = [] - this.detailSource.forEach(item => { - item.subList.forEach(detail => { - if (detail.scaned) { - detail.toLocationCode = this.toLocationCode; - var filterResult = itemList.filter(res => { - if (res.itemCode == item.itemCode && - res.locationCode == detail.toLocationCode && - res.batch == detail.batch && - res.inventoryStatus == detail.inventoryStatus) { - return res - } - }) - //去掉重复元素 - if (filterResult.length == 0) { - var result = { - itemCode: item.itemCode, - locationCode: detail.toLocationCode, - batch: detail.batch, - inventoryStatus: detail.inventoryStatus, - } - itemList.push(result) - } - - } - }) - }) - return itemList; - }, - setRecordParams() { var subList = [] var creator = this.$store.state.user.id @@ -467,7 +433,11 @@ toBatch:info.batch, fromLocationCode:detail.locationCode, toLocationCode:detail.toLocationCode, - handleQty:detail.handleQty + handleQty:detail.handleQty, + fromPackUnit:detail.packUnit, + toPackUnit:detail.packUnit, + fromPackQty:detail.packQty, + toPackQty:detail.packQty } ] subList.push(submitItem) @@ -532,15 +502,17 @@ }) }, - updateData() { - // this.calcTreeHandleQty(); - for (var i = 0; i < this.detailSource.length; i++) { - let item = this.detailSource[i]; - if (item.qty == 0) { - this.detailSource.splice(i, 1) - } + updateData() { + calcHandleQty(this.detailSource); + for (var i = 0; i < this.detailSource.length; i++) { + let item = this.detailSource[i]; + if (item.qty == 0) { + this.detailSource.splice(i, 1) } - }, + } + this.$forceUpdate(); + + }, clearData() { this.fromLocationInfo = {}; @@ -548,6 +520,7 @@ this.fromWarehouseCode = ''; this.toWarehouseCode = ''; this.detailSource = []; + this.to } } } diff --git a/src/pages/issue/record/directIssue1.vue b/src/pages/issue/record/directIssue1.vue new file mode 100644 index 00000000..4d552454 --- /dev/null +++ b/src/pages/issue/record/directIssue1.vue @@ -0,0 +1,557 @@ + + + + + \ No newline at end of file diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index a6a257b0..4d2ccead 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -124,7 +124,7 @@ uni.clearStorage(); //清除缓存 if (process.env.NODE_ENV === 'development') { this.username = "admin" - this.password = "123456"; + this.password = "win123456"; } uni.setNavigationBarColor({ frontColor: '#ffffff', From 1aadce221f9a8e71f9684e113efe703382f0095c Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 16:20:03 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/detail/comDetailCard.vue | 6 +++++- src/mycomponents/detail/comJobDetailCard.vue | 8 +++++--- src/mycomponents/package/packageList.vue | 2 +- src/mycomponents/record/recordComDetailCard.vue | 2 +- src/pages/productPutaway/job/productPutawayDetail.vue | 4 ++-- src/pages/productPutaway/record/productPutawayRecord.vue | 2 +- src/pages/putaway/job/putawayDetail.vue | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue index 242543f4..171b48f0 100644 --- a/src/mycomponents/detail/comDetailCard.vue +++ b/src/mycomponents/detail/comDetailCard.vue @@ -13,7 +13,7 @@ - + @@ -74,6 +74,10 @@ type: Boolean, default: true }, + isShowStatus: { + type: Boolean, + default: true + }, }, watch: { dataContent: { diff --git a/src/mycomponents/detail/comJobDetailCard.vue b/src/mycomponents/detail/comJobDetailCard.vue index ee9407fc..142df77d 100644 --- a/src/mycomponents/detail/comJobDetailCard.vue +++ b/src/mycomponents/detail/comJobDetailCard.vue @@ -10,7 +10,7 @@ :isEdit="settingParam.allowModifyQty=='TRUE'" :settingParam="settingParam" @collapseChange="collapseChange" - @updateData="updateData" + @updateData="updateData" :isShowStatus="isShowStatus" > @@ -60,8 +60,10 @@ type: Object, default: null }, - - + isShowStatus: { + type: Boolean, + default: true + }, }, watch: { diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue index 7f631f8b..30cad4ee 100644 --- a/src/mycomponents/package/packageList.vue +++ b/src/mycomponents/package/packageList.vue @@ -5,7 +5,7 @@ diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue index 42490f0c..d1082ca4 100644 --- a/src/mycomponents/record/recordComDetailCard.vue +++ b/src/mycomponents/record/recordComDetailCard.vue @@ -15,7 +15,7 @@ - diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index c4c53f0f..1623c02b 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -13,8 +13,8 @@ - diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index 820d4a28..25300cbd 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -9,7 +9,7 @@ - diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 78542323..a722f558 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -14,7 +14,7 @@ - From 66c38efc422c69da797d4a7bfba7e448741c2c17 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 14 Jun 2024 18:54:02 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=20=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productReceipt/job/productReceiptDetail.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 636f6177..001c95db 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -222,7 +222,10 @@ that.detailSource.forEach(r => { r.subList.forEach(s => { if (this.scanedPackingNumber && this.scanedPackingNumber == s - .packingNumber) s.scaned = true + .packingNumber){ + s.scaned = true + s.handleQty =s.qty + } }) }) } else { From 9baefe421a513aaadfd359360953b957522288ea Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 19:01:24 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=A8=A1=E5=9D=97fromI?= =?UTF-8?q?nventoryStatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/package/packageCard.vue | 2 +- src/mycomponents/recommend/recommend.vue | 2 +- src/mycomponents/scan/winScanPackAndLocation.vue | 6 +++++- src/pages/productPutaway/job/productPutawayDetail.vue | 1 + src/pages/productPutaway/record/productPutawayRecord.vue | 2 ++ src/pages/productReceipt/job/fgProductReceiptDetail.vue | 4 +++- src/pages/putaway/job/putawayDetail.vue | 3 +++ src/pages/putaway/record/putawayRecord.vue | 3 +++ 8 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue index f56df994..4ddd0e74 100644 --- a/src/mycomponents/package/packageCard.vue +++ b/src/mycomponents/package/packageCard.vue @@ -19,7 +19,7 @@ + :handleQty="Number(dataContent.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus"> diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue index b362feed..bf7b175a 100644 --- a/src/mycomponents/recommend/recommend.vue +++ b/src/mycomponents/recommend/recommend.vue @@ -18,7 +18,7 @@ + :handleQty="Number(detail.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus"> diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index c9e05933..eef6b720 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -284,7 +284,11 @@ if (this.allowNullBalance) { this.allowNoneBalance(datas); } else if (this.noShowBalanceMessage) { - this.countCallBack(datas); + if(Array.isArray(datas)){ + this.countCallBack(datas[0]); + }else{ + this.countCallBack(datas); + } } else { this.mustHavaBalance(datas); } diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 1623c02b..7e0297bf 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -346,6 +346,7 @@ itemDetail.handleQty = Number(result.balance.qty) itemDetail.balance = result.balance; itemDetail.toInventoryStatus = result.balance.inventoryStatus; + itemDetail.fromInventoryStatus = result.balance.inventoryStatus; itemDetail.balance.balanceQty = Number(result.balance.qty) itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packUnit = result.package.packUnit diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index 25300cbd..ac453cca 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -153,6 +153,7 @@ if (item == undefined) { var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); // + newDetail.fromInventoryStatus = balance.inventoryStatus; itemp.subList.push(newDetail); this.detailSource.push(itemp) } else { @@ -166,6 +167,7 @@ }) if (detail == undefined) { let newDetail = createDetailInfo(balance, pack); + newDetail.fromInventoryStatus = balance.inventoryStatus; item.subList.push(newDetail); } else { if (detail.scaned == true) { diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 61a8cd7f..4c7e6113 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -380,7 +380,9 @@ pointData.push({ barcodeString: item.barcodeString, //标签 itemCode: item.itemCode || '', //物品代码 - itemName: item.itemName || '', //物品名称 + itemName: item.itemName || '', //物品名称 + packName: item.packName || '', //包装名称 + itemType: item.itemType || '', //物料类型 itemDesc1: item.itemDesc1 || '', //物品描述 relateNumber: item.relateNumber || '', //relateNumber包装号 batch: item.batch || '', //批次 diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index a722f558..7551de0a 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -345,6 +345,9 @@ scanedLength++; } }) + //大哥让加的 + itemDetail.fromInventoryStatus = result.balance.inventoryStatus; + if (itemDetail.scaned && scanedLength == itemDetail.packList.length) { this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index ac4570f6..2d4598dc 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -172,6 +172,7 @@ newDetail.poLine=poLine; newDetail.poNumber=poNumber; newDetail.supplierCode=supplierCode; + newDetail.fromInventoryStatus = balance.inventoryStatus; itemp.subList.push(newDetail); this.detailSource.push(itemp) @@ -195,6 +196,8 @@ newDetail.poLine=poLine; newDetail.poNumber=poNumber; newDetail.supplierCode=supplierCode; + newDetail.fromInventoryStatus = balance.inventoryStatus; + item.subList.push(newDetail); calcHandleQty(this.detailSource); }); From 9e74f3242e4889553c707bd37f3afceb12aad9e5 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 19:18:22 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pointProductReceipt/index.vue | 26 +++++++++---------- .../job/fgProductReceiptDetail.vue | 23 ++++++++-------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/pages/pointProductReceipt/index.vue b/src/pages/pointProductReceipt/index.vue index 28cb3a00..097b2fbb 100644 --- a/src/pages/pointProductReceipt/index.vue +++ b/src/pages/pointProductReceipt/index.vue @@ -12,8 +12,8 @@ {{item.itemName}} - 物料描述 - {{item.itemDesc1}} + 包装名称 + {{item.packName}} 包装号 @@ -37,8 +37,8 @@ {{item.batch}} - 班次 - {{item.shiftCode}} + 物料类型 + {{item.itemType}} 打印时间 @@ -117,20 +117,20 @@
${item.itemName}
- 物料描述 - {{item.itemDesc1}} + 包装名称 + ${item.packName} 包装号 - {{item.relateNumber}} + ${item.relateNumber} 生产线 - {{item.productionLineCode}} + ${item.productionLineCode} 数量 - {{item.qty}} + ${item.qty}
@@ -139,15 +139,15 @@
批次 - {{item.batch}} + ${item.batch} - 班次 - {{item.shiftCode}} + 物料类型 + ${item.itemType} 打印时间 - {{item.printTimes}} + ${item.printTimes} ` diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 4c7e6113..51cca9c7 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -70,6 +70,7 @@ import { getManagementPrecisions } from '@/common/balance.js'; + import { getCurrDateTime} from '@/common/basic.js'; import { getProductReceiptJobDetail, @@ -377,19 +378,19 @@ console.log('打印', res) let pointData = [] res.data.forEach(item => { - pointData.push({ - barcodeString: item.barcodeString, //标签 - itemCode: item.itemCode || '', //物品代码 + pointData.push({ + barcodeString: item.barcodeString, //标签 + itemCode: item.itemCode || '', //物品代码 itemName: item.itemName || '', //物品名称 packName: item.packName || '', //包装名称 - itemType: item.itemType || '', //物料类型 - itemDesc1: item.itemDesc1 || '', //物品描述 - relateNumber: item.relateNumber || '', //relateNumber包装号 - batch: item.batch || '', //批次 - productionLineCode: item.productionLineCode || '', //生产线 - shiftCode: item.shiftCode || '', //班次 - qty: item.qty || '', //数量 - printTimes: item.printTimes || '' //打印时间 + itemType: item.itemType || '', //物料类型 + itemDesc1: item.itemDesc1 || '', //物品描述 + relateNumber: item.relateNumber || '', //relateNumber包装号 + batch: item.batch || '', //批次 + productionLineCode: item.productionLineCode || '', //生产线 + shiftCode: item.shiftCode || '', //班次 + qty: item.qty || '', //数量 + printTimes: getCurrDateTime() //打印时间 }) }) console.log('pointData', pointData) From 91a2fd0c1bf3c11eb2fc459f1f9683360bae3a38 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 14 Jun 2024 20:04:52 +0800 Subject: [PATCH 09/22] =?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=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productPutaway/job/productPutawayDetail.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 1623c02b..21e512ea 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -202,7 +202,10 @@ that.detailSource.forEach(r => { r.subList.forEach(s => { if (this.scanedPackingNumber && this.scanedPackingNumber == s - .packingNumber) s.scaned = true + .packingNumber) { + s.scaned = true + s.handleQty =s.qty + } }) }) that.isCheckLocation = getSwitchInfoByCode(that.switchCode) From 834bf0a12e9e6e2f0ad6bf7622c7cc45012319d0 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 15 Jun 2024 14:17:06 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/job/overPackageJobDetail.vue | 16 +++-- .../package/record/overPackageRecord.vue | 28 +++++++- src/pages/point/index.vue | 69 ++++++++++++++----- 3 files changed, 87 insertions(+), 26 deletions(-) diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 324c66c1..2cb32dd4 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -332,15 +332,19 @@ let list = []; res.data.forEach(item => { list.push({ - itemNumber: item.itemCode, // 物品代码 + itemCode:item.itemCode, // 物品代码 itemName: item.itemName, // 物品名称 - referenceOrderRow: item.poLine, // 订单行 - referenceOrderCode: item.poNumber, // 订单号 - supplierCode: item.supplierCode, // 供应商 + packName: item.packName,// 包装名称 packageCode: item.number, // 包装号 - amount: item.qty, // 数量 + batch:item.batch,//批次 + parentNumber:item.parentNumber,//父包装号 + itemType:item.itemType,//物料类型 + asnNumber:item.asnNumber,//ASN + supplierCode: item.supplierCode, // 供应商 + qty: item.qty, // 数量 + printTimes:getCurrDateTime(), // 打印时间 barcodeString: item.barcodeString, // 标签信息 - barcodeBase64: '' + barcodeBase64: '', }) }) this.showCommitSuccessMessage("提交成功
生成翻包记录
", list) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 7bd7be06..42ce7591 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -342,7 +342,25 @@ overPackageRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成翻包记录
" + res.data) + let list = []; + res.data.forEach(item => { + list.push({ + itemCode:item.itemCode, // 物品代码 + itemName: item.itemName, // 物品名称 + packName: item.packName,// 包装名称 + packageCode: item.toPackingNumber, // 包装号 + batch:item.batch,//批次 + parentNumber:item.parentNumber,//父包装号 + itemType: item.itemType,//物料类型 + asnNumber:item.asnNumber,//ASN + supplierCode: item.supplierCode, // 供应商 + qty: item.qty, // 数量 + printTimes:item.printTimes, // 打印时间 + barcodeString: item.barcodeString, // 标签信息 + barcodeBase64: '', + }) + }) + this.showCommitSuccessMessage("提交成功
生成翻包记录
" + list) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -414,12 +432,18 @@ this.fromLocationCode = code; this.openScanPopup(); }, + - showCommitSuccessMessage(hint) { + showCommitSuccessMessage(hint,pointData) { this.$refs.comMessage.showSuccessMessage(hint, res => { this.detailSource = [] this.fromLocationCode = ''; this.dataContent = {} + if (pointData.length > 0) { + uni.navigateTo({ + url: `/pages/point/index?points=${JSON.stringify(pointData)}` + }); + } }) }, diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue index 2bea1449..62bbe201 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -5,36 +5,53 @@ 物品代码 - {{item.itemNumber}} + {{item.itemCode}} 物品名称 {{item.itemName}} - 供应商 - {{item.supplierCode}} + 包装名称 + {{item.packName}} 包装号 {{item.packageCode}} - 订单行 - {{item.referenceOrderRow}} + 父包装号 + {{item.parentNumber}} + + + ASN + {{item.asnNumber}} + + + 数量 + {{item.qty}} + - 订单号 - {{item.referenceOrderCode}} + 批次 + {{item.batch}} - 数量 - {{item.amount}} + 物料类型 + {{item.itemType}} + + + 供应商 + {{item.supplierCode}} + + + 打印时间 + {{item.printTimes}}
@@ -102,23 +119,31 @@
物品代码
-
${item.itemNumber}
+
${item.itemCode}
物品名称
${item.itemName}
-
供应商
-
${item.supplierCode}
+
包装名称
+
${item.packName}
包装号
${item.packageCode}
-
订单行
-
${item.referenceOrderRow}
+
父包装号
+
${item.parentNumber}
+
+
+
ASN
+
${item.asnNumber}
+
+
+
数量
+
${item.qty}
@@ -126,12 +151,20 @@
-
订单号
-
${item.referenceOrderRow}
+
批次
+
${item.batch}
-
数量
-
${item.amount}
+
物料类型
+
${item.itemType}
+
+
+
供应商
+
${item.supplierCode}
+
+
+
打印时间
+
${item.printTimes}
` From c3407bfabf24317f61c91942e29af915fff6850e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 15 Jun 2024 14:56:49 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E6=89=93=E5=8D=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/record/overPackageRecord.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 42ce7591..6ca28151 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -342,8 +342,9 @@ overPackageRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - let list = []; - res.data.forEach(item => { + let list = [] + let item = res.data; + // res.data.forEach(item => { list.push({ itemCode:item.itemCode, // 物品代码 itemName: item.itemName, // 物品名称 @@ -359,8 +360,8 @@ barcodeString: item.barcodeString, // 标签信息 barcodeBase64: '', }) - }) - this.showCommitSuccessMessage("提交成功
生成翻包记录
" + list) + // }) + this.showCommitSuccessMessage("提交成功
生成翻包记录
", list) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } From 7a7b0f5bff36a2e137f951af920fae29c1804874 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 15 Jun 2024 15:36:58 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=8F=AB=E6=96=99isCal?= =?UTF-8?q?lMaterialsLabel=20=3D=20"TRUE";?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/request/issueScanRequest.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue index d69caa27..69f04a56 100644 --- a/src/pages/issue/request/issueScanRequest.vue +++ b/src/pages/issue/request/issueScanRequest.vue @@ -108,6 +108,7 @@ setParams() { this.detailSource.dueTime = getCurrDateOneMonthsTimes(); + this.detailSource.isCallMaterialsLabel = "TRUE"; return this.detailSource }, submit() { From 40ae9cf066d95aef29d1485f7f22ecf286a25018 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 17 Jun 2024 10:56:05 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug:=E6=88=90=E9=83=BD?= =?UTF-8?q?=20=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=89=AB=E7=AE=B1=E7=A0=81=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=83=BD=E6=8F=90=E4=BA=A4=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/job/deliverDetail.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue index e534e8d7..6ca4fb13 100644 --- a/src/pages/deliver/job/deliverDetail.vue +++ b/src/pages/deliver/job/deliverDetail.vue @@ -247,6 +247,9 @@ var params = this.setParams() console.log("提交参数", JSON.stringify(params)); + if(params.subList.length==0){ + this.$refs.comMessage.showSuccessMessage('请扫描箱码') + } deliverJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { From 46da16cd4f58dd3f503d172ec798e851e0947c80 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 17 Jun 2024 13:33:23 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0app=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 8 ++++++++ src/static/logo/144x144.png | Bin 0 -> 22246 bytes src/static/logo/196x196.png | Bin 0 -> 36797 bytes src/static/logo/72x72.png | Bin 0 -> 7095 bytes src/static/logo/96x96.png | Bin 0 -> 11378 bytes 5 files changed, 8 insertions(+) create mode 100644 src/static/logo/144x144.png create mode 100644 src/static/logo/196x196.png create mode 100644 src/static/logo/72x72.png create mode 100644 src/static/logo/96x96.png diff --git a/src/manifest.json b/src/manifest.json index c676b8f7..4622e0a5 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -74,6 +74,14 @@ "parameters" : {} } } + }, + "icons" : { + "android" : { + "hdpi" : "src/static/logo/72x72.png", + "xhdpi" : "src/static/logo/96x96.png", + "xxhdpi" : "src/static/logo/144x144.png", + "xxxhdpi" : "src/static/logo/196x196.png" + } } }, "nativePlugins" : { diff --git a/src/static/logo/144x144.png b/src/static/logo/144x144.png new file mode 100644 index 0000000000000000000000000000000000000000..ac2d53dec235bc47f8bf76eaa40de48b0dc800fb GIT binary patch literal 22246 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 literal 0 HcmV?d00001 diff --git a/src/static/logo/196x196.png b/src/static/logo/196x196.png new file mode 100644 index 0000000000000000000000000000000000000000..931a7447e105c4bb0ea3e5af4cfca81f986b4568 GIT binary patch literal 36797 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 literal 0 HcmV?d00001 diff --git a/src/static/logo/72x72.png b/src/static/logo/72x72.png new file mode 100644 index 0000000000000000000000000000000000000000..db7a5f7524dd4623d0d2ae9d972b073055dda000 GIT binary patch literal 7095 zcmV;o8%X4dP)Px#1am@3R0s$N2z&@+hyVZ^VM#+wX1ivTCJs9Qfsj# zOKrOi7zDP0Z5AgEOAchyGjV1nGlwB$&Pf8yA&1Q5IFket2+5FT3=RXq z#7I~+#vqVvSwc%|Ye}tc_1;xo^_F|@Z~my3u!H0Ui3Ebb=e(-wSFdlq-=}`}cYpWy zUR~iuNL7b`+ku}3+JS+k=N~1_Ep7XOuL8S8WdBvQsH(TC>Ph{_t6i#k`|~l7D}WgQ zJ_@|$stEt+XgBa)5jpjD-}oLtOK^74>_$IMIt9G-?{>TA0Mcfx*~O1ue7RPd18#h_ zCz*>cmOSS{eth9T)An6UEP!VL0zScyU$?rP2581#V5y5OMeKqxV$2F401>V*##}4y6p`H*0qvrh=Uihc>S}0q z2DFBEXK~3sgc?Qz&=fH#UMx;CR6J+~njz{CEP@3*YHElW&^}DK9t}4`u!%6Y4KYQ2 z0I*Jp$XZzn%=@lgyNYv@*z6EuM=Vm*#Sf+!6#&tnMzi1>_WuRb1*ttWMaOP`J_VT6{{IY0EDP|L@am#1?Mc@ zdz`gkV^mYrDdixetvtoL?lWxZKf|rpkF#7qNiI=*V1vsy zkei_t#zZ0n65ur<)0i}aI1ZU@v~qs3lQWYod}qAD>DhqBLIrQ8D1@iDq5B+nY#!m& zTh7wmHVNr+T;UF)$}bV+He3y$-J+@|`F=((wPeY+@r}&@BTzv)KI6lbNPIfZU z=*79^RHB4|<@0P_<=N1ubmvE@$XP-+M_^Kr1gImVh&YrCNHHX!b�Mfc1H-56HBQ zdOX01^W8jgsEu!o^l@r7A~o}L2P6E%b>HD_!{=Dva|p5BXyxBgXni|D)cySc+Apd) z%S+0A6lW*V_#q_ze_({kJIl?3)7;dzNG~xFvxvqR$)Q+O zVj4D}Ru5UIE7c^Xp;f#pp${nT~;>03BhRb@WxwSks+Q%bb z-@;=@+NfrWl-+6W+^MMw#~7JzrL_D*6k1-vOAO|7qN@5*;P}QfX#6ppjFP%R z4xQ=aulB9tK>amn;2G+j@S-h#(STGl7VDoRpX?^oDJJ~@ z4}NniUpc;(m}RUe#@v1LBCl9|meyc`91iDNm`+!-_f(#}qr!>FkU85RUK(xA3{IyoHbN>cPbs zn@dmgFMsB7wk;ncsJw^HHTM%nZPx;j$1eT}8vhwW%0zVo4}4{iZ_T`dVifSkZ3%A} zdWz*dLzJ#%UQ6s6E%N096~-HDXwZ$S!>Yj(p}y%A>OJZ_cm)UQo12#ms~M__dc}E9 zm<3=#)#KIS)q~BUB#2LGabv9S-Otb6d5TwUev*=%#-~MQbrp}Fd_5oeKN~q-U(KrM zNq+UGo@VQs!vux5(7*XNF(&`K)(0Q>zz06?Jg!4l--W6F4id~VX?ywI&)>q==WZd2 ziu{wCr@3eQmssY{5co338*TjW$CvS?BiAwEHqu}@&P7DtBC1Wpd068br2WEG$I>N>uB z><+BS@vc`L=V!0~CS_T`ljCf48GrHkY7S?cP{|W&hzoLrQA7k7BZv`AE zF^Un7F`k?@h$JNtM<5m>o}8H_k_Lgv5KS>+2~3SJY!I0kLyR#>8hP6MJexbdMNjD* z>O7j2SO{Qj;Z@XKKd?wwa-PV1heQK<2LF)uo;$AyD7>=wc(U{_$h#TRKzZU=ACDip z6(?=nw)qf0dHq3(TmZ3P3Usv9c+VSVP@YD}5Mxmz7y^tB0YL>sJ)#~^R8lbM(tImz zdKNKAg3%PCF`^lWZMLaR7($B2W4vHA0ken|MPwF}6>+kFO(WD+NP{}Y=UHBS6l@MM zuqDOEo`MUR8vR3ByIzM0F5lIz2*_tA36d`&Dom!E_`gr~F%^~RH*@^#D@W)I4&i-( zX3H?)0wwAc!Xv2b!U3U1i0!}z^8{Irz@%i_fi0XPvJqqvK^WthBA1k?=NhDG3k47P z{1{?eaN#sY4W0y{#_>iEnv@x6nIz0jA|^q|fP@f-_aRgB>zIsFQU_uqY!*V6!%@T8 z5>Z2G2(&RrSKDzKjVGCz+C%s9J6;MPC2M?+hzq!|hi^R7!MWM%34(|>-8{mw@)`bm z|Es8Hj@NFk(wnPde8_mMmxuOrkuS%*?R5z)dY17<8-MvWSQGmiXe60dF2!{S(pv^wO@Ri{+WK| zgW#~H#9w`VJ)hdMow{F*u@*H`cxUi7!b*yg5?R>UdyIec);xJR&+O=@=wAMME|)}J z7LfWXF8u;|G0aIjyASrT$Vxi$r+M|JqZpmxvj^{_HeY1(ssr@39wh*(SwDMD4N_`N zc#}UzhmI240Un#Yj)kzDwH=;<#%K@_23;T%h@M4*MW(YI98T6T><^JJi7}HPDG(yo zqG6q>sLZ6SBazYXmO)U=(sQm65+}=;P1dt%jpx6>f_`~D_$HRZ;ui%fp>W>B)yEx4B%y!^?m2*Xdgor z5RmvBMHJ&4#^;c%fDclZ%M`!*hKRnxK~j@qyr*bm$Sg)1c$vqcILy+cMZH1AVWdiw zcH(VFA`zh~0Um9Bn;;4(Nz`DrkYGdQ=DsKRh1WeykS$UV=OGPAY@P@8ZoYl&R`RLA zScB0VXqD>B)0YKw*?NHbF@ms$GYw9iH&o-*L^{Xym6WoKfh$l*6;H;zSzz8<7F@uh z^%zsfxGFxF$L1DDMF|pcQX@8paef3V$MNPngt=p=hFEFEOG4geoj}3(Jc=U= z6YwRB&*8&`rNUYOT!hmM3t<`(IEV2WflQ%N#pnXYFA`-Tk=99##Q~Wp4U;D&Pv94+ zSC3u}#pON7*il5Qs4iz_rkzwQr6kXa$^tM;Vpfu9%$)1xcOG6(-t-}X$EMvhk~TW? zO3v4jFeB$;;?UBlt>m}U-2UO?I`IhYJJ0dWE-csyY-MWjxM5QrflCTF@Sg+)SzIWf$HhK@j*L$+GPXIOP) zVSs5_K}iZY@`NTtbLTPC5m&@mgZd1QLlne$j3`Km(IWT~xH6#&h^Qkp@Zy>=S|gk* z;(Z9}iSx5Oa%=@BKKW(>sgfBX*C-RZIgZS>lZgRmz&A5_Rl&KKCaM<%)cjJMQB*Q= zA*gH4gBEQ9WSA_&Sx-*q__^Cgxn<2>3eIzM?m9m3M+2BrGnyzFUM=c9tMVuKFF!L* zmrmiLDmkB$GiMN=5K%%hLDgb|1ynM`l_02-g$qQ%3}nj?Ne~SPwFs`YSu-*VC^6~< zZv&s)dE>=kjTL+H=g2_ z)j7PxIEk?Y>_6Rx?Ab(Kw?Q<;hRzvo9vlNx#T!Q>?dH_zAhp>Ej0icc($hIdsc-@6 z24R6f3$*&v4A{pBgE|dUBW$#hN=m1{8)H{o@*MR|n~UW&yy!fLa0{8V5HZKH_Cu^I zZ|CW>!Qm6DnOZ2(S*~(pZ;ko3leD#*BT$FP7-hGW)s-`J6`NCYYi3FCv{_|Vd-&U@ zU(<}ISd3Yum~Z9gzQ+N@X_3e-@Wk1E_8wnPmcM|{ioEsuC)vK?OH}h!@~I(7I{A-( zavk_VjG3e(Y4B^mbcmZ)d=ZByv2FOUMkbzyc*^3*j71eNDVd4EBgAtXxgA0jq#uJAk_x-xSv#uM5&UmR7s5iEJOVlh};E+mnjvOkjXqAhZl!9Sktw@ z+g@>qwUzT2ohLI1QQ;QCsP(ddt~i@_>BIQyy@Wc;ar+v6`FH;*r)wJ+D(vAm?)@Um zDyQ&a1SUpY3xPP$Dw1{LOa;P4L=@`+B$t2_#1#=WhdScoC&aDN?;A%C)l(b@nhuE1Wn5mf+W2$L*m zCvnz8kSYOZXb`gM`cKfa=I+Y^x?(*@Oc#lLl*pZ@6wVVB*7D6G0T*1E#YMyRt%u1m zPari^icHs+F`unuG4fb1*sMsZ5oi&Uwxh0qiU9ZnJdw`f zTmh-v%D|RiLCh7R&1LrjBJD)Q50a%nMIoEvC${fq|A~OVIkbf@9NNZ)6_dQ>6<;H? z0U8QpGi&(dgV!+{_n={w&<7ZkVS)vWaYQ&mNiZfQFe%1(j09*jOI}h6wgvJr#(>XP zF+oHztB{LgOpppj1Knki*IaUVyes&6T|$^ zN4HZfE%3%IhY9Qyn^x}Q9q(Aj|9U9T)6-?}CGu$nZ-jbiF?a%NmL{1NTmgr{ON#MA z;6qTb3QjDjA|6nSsw@pRNi%zPLK>tPACpf7>m%x6jh1MNHw-NDFYfpng)}8`ITE9s zn7EPu@z({uGkq&7%@n`#rf*YeU8J(|F1pve_4yFIP{~yYbFU!H4if0ol!6J?uUpNr zla{HetsEH1qm_Bq44k7iYtY+rh*xiGP)_?9npbyhJF0}9ee32AH$mZheJfaqEl7xWd5}5; zb=2o@TEf%3lA-FGn>6zi6i~C22qr)Rc$|i)<`JJ^6#6QjH{E!eJ8$|jUAbdKZVY3K z%=tgO4>HI$@u)9c2 z#OdrO_~VD~;tStePrx)oodK`Mk{T^jE zjSX^)H*V)I9=(w-?pw`;w1f6wgxB;R=BIBt!M62BDYr~wogx%aEn>BegjVWl7mJJC z%vO7tS!kykM`W5qaJ1!XbhcceQktMOnxcp$lnbaC#i}8UbBM;&eJh90ZQ`+g>v;H? z9?rQzQWLOa%{ksXe2&4kZ;(YX?d$$6ef{@daX7zrfSQzW*;CYO|A{bu9HYXVtmbs> zHXeR_GrJEg=X?y9N!FH6^ZJbw+_Lr%8`nB&clxNf2q)f>aB5pT`5>P@8~H z5$|b)A(<-@c!SH7`eKFAnKt$v@8+>X>o_>o&kSu;Ou#Ew&T`MtX|C@*Kx9UUTDP-e z@I#c^w(mt#1j1|^()VOtX%Jz*TtZ6wyhaV+ZypGm&|C&nAPQ*O_NcDpQ^ej*|{wlWmd$`7< zxF`W%MC|~hv)A$MGaGs8Ob3Tf1WZ+zQL`agut2Mwqr?Ixnk8SXV}b;Opw5t5Lz?8V zS&2E#kSP`ql>t_`4z z(hO@4k<>nqtv`aXPk|5dk|)y=^=t)G_4S;c?qzH|I;_6jHj|rdiojXH{EDSMfCE=rkb<%@S&K1Nqh=I#;}te9H#JvI8)@yljZ*u~h`hAm`(pKj19VA>sv<06vvZ`4eK>mv>rN76HN@6YXHjpPx4x*L z1PCEW9x(;dpbv@q$rsjAEDaImS0a-C`?y#7?*q^kq}se>v-I)G-#rakdX&Ex5LePa z9H1W&UGFX%a*IA(2uzdKT5diMHbAY`k z=Gc3Dj^Xv~Z0c*_(|gWd+mkTtH;VtVW3he*z?No{(JGXT62lovz zysrJyK7bFtb2DG~&#waDp5b2hd~gSQKDdMX?i>JMczruNw{~;?J%fzR#vB=|@$3O* zczrw7hUJ6r+|2#=4D#+BtN4TahS<5~`}*PBWu@xBYK)lO*Q&uIV>S9Z3T*0Y0bu8r zZu&Y492u)!I_BLwRsqo0@!iY4?|$tn9{BPpUi<#XcxdnVrM7l%>1OZoId*R8W_VpY zl|p#w_)0P4{(A;5dCmL&_!)K`oMP9(scU5pM$GPD{A+(a-h1nN-h*8IiVJ<61=jYI z=&s~Ab)inB7_zCag(K%{OjlDX#gNx*>g32+jp6m}REi;=e(Wsy$Z-EXgYM}|!+TX<;iIMcP1ZEITDdt#36N{-?6?fm7}$M~;r+emjM$ELm(-Z<35fzbuV zX5*`d1MGh4BRhY~065{j*P_KEV>LGQwKU_wV`ncxIC8G(L6u_2*lf)GKRtNKQvg1_ z=Pd91=w2#?kdMA+D**T1HE^lB+;`^yeH{gc*S9mgzMa0#rkCD#=KvpmXoOt{r#LcJ zTx zyADoq&n>+Gy#F(Y>FX>oysqg*_uV;g>9~v2rJY;5*}3&9gS2u=?00+AbLyBw|9;ni zhV0{qWCfUuqu{QCQ&b!FIs2;(dnv~4JwA77aM*id?m5T4M9qn?bN`2TURp!wdkVcn z_wO1~&x6R1*-9|VDRJ!F|JyrHJ$v`}%*FP9c;|j`?4-GD)sKgS&t48r^R4I6&@b=0 zUE#m+16dj7hd|0HC%pHWrGR`ny{Ky`L-+3*^6GCFF}L9vTFRMzDB{#h&>YQq=bYj{ hXT;3=D8J{^bH?C`b+%r+C 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 literal 0 HcmV?d00001 From abae5057c33f6786cafc964facc097673e793e58 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 17 Jun 2024 14:07:02 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=BF=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/record/overPackageRecord.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 6ca28151..63a486ce 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -343,8 +343,7 @@ uni.hideLoading() if (res.data) { let list = [] - let item = res.data; - // res.data.forEach(item => { + res.data.forEach(item => { list.push({ itemCode:item.itemCode, // 物品代码 itemName: item.itemName, // 物品名称 @@ -360,7 +359,7 @@ barcodeString: item.barcodeString, // 标签信息 barcodeBase64: '', }) - // }) + }) this.showCommitSuccessMessage("提交成功
生成翻包记录
", list) } else { this.showErrorMessage("提交失败[" + res.msg + "]") From 7fc04491da214b1b861091e64bf472cebcb6ffa7 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 17 Jun 2024 15:55:17 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0type=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productPutaway/job/productPutawayJob.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index b68fdafe..f7475548 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -342,6 +342,11 @@ column: "itemCode", action: "==", value: result.label.itemCode + }, + { + column: "type", + action: "==", + value: this.type }, // { // column: "fromLocationCode", From 80788b560d5a1f11eef474a85e100286824b2d23 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 17 Jun 2024 16:09:01 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/record/overPackageRecord.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 63a486ce..3c28920d 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -101,6 +101,9 @@ import packageTarget from '@/mycomponents/package/packageTarget.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import packUnit from '@/mycomponents/qty/packUnit.vue' + import { + getCurrDateTime + } from '@/common/basic.js'; export default { components: { @@ -355,7 +358,7 @@ asnNumber:item.asnNumber,//ASN supplierCode: item.supplierCode, // 供应商 qty: item.qty, // 数量 - printTimes:item.printTimes, // 打印时间 + printTimes:getCurrDateTime(), // 打印时间 barcodeString: item.barcodeString, // 标签信息 barcodeBase64: '', }) From 02048a8413e064fff65e6caeac327399a91d2847 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 17 Jun 2024 16:48:07 +0800 Subject: [PATCH 18/22] toBatch --- src/pages/package/record/overPackageRecord.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 3c28920d..e335b7c1 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -352,7 +352,7 @@ itemName: item.itemName, // 物品名称 packName: item.packName,// 包装名称 packageCode: item.toPackingNumber, // 包装号 - batch:item.batch,//批次 + batch:item.toBatch,//批次 parentNumber:item.parentNumber,//父包装号 itemType: item.itemType,//物料类型 asnNumber:item.asnNumber,//ASN From 5baab70e77013fe94d5812d48614df2d8abea966 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 17 Jun 2024 17:16:07 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/coms/comScanReplishPack.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index 5e8eda57..da064ae4 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -567,15 +567,17 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode); if (item != undefined) { item.Locations.forEach(l => { - let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b - .batch == record.batch); + let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b + .packingNumber == null || b.packingNumber == '') && b.batch == + record.batch); + let rIndex = batch.Records.findIndex(r => r.packingNumber == record .packingNumber && r .batch == record.batch); batch.Records.splice(rIndex, 1); }) } - this.$emit('updateData', item); + this.$emit('updateData', record); } }); }, From 2e13528e1694c5733e6c99a05d5be23fe1b0d67e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 17 Jun 2024 18:42:12 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/job/deliverDetail.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue index 6ca4fb13..ff86d8dc 100644 --- a/src/pages/deliver/job/deliverDetail.vue +++ b/src/pages/deliver/job/deliverDetail.vue @@ -248,7 +248,9 @@ console.log("提交参数", JSON.stringify(params)); if(params.subList.length==0){ - this.$refs.comMessage.showSuccessMessage('请扫描箱码') + uni.hideLoading() + this.$refs.comMessage.showConfirmMessageModal('请扫描箱码') + return } deliverJobSubmit(params).then(res => { uni.hideLoading() From 07d79187083f59f346043fc8266ca086e7600d06 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 17 Jun 2024 19:50:05 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20this.showErrorMessage("?= =?UTF-8?q?=E8=AF=B7=E9=80=89=E6=8B=A9=E7=9B=AE=E6=A0=87=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E8=A7=84=E6=A0=BC")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/record/overPackageRecord.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index e335b7c1..b066203f 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -306,7 +306,7 @@ }, commit() { if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) { - if (this.toPackUnit == "包装规格") { + if (!this.toPackUnit||this.toPackUnit == "包装规格") { this.showErrorMessage("请选择目标包装规格") return; } 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 22/22] =?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); + } }) })