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] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=A8=A1=E5=9D=97fromInvento?= =?UTF-8?q?ryStatus?= 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); });