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 01/12] =?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 02/12] =?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 03/12] =?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 04/12] =?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 05/12] =?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 06/12] =?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 07/12] =?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 08/12] =?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 09/12] =?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 10/12] =?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 11/12] =?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 abae5057c33f6786cafc964facc097673e793e58 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 17 Jun 2024 14:07:02 +0800 Subject: [PATCH 12/12] =?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 + "]")