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 1/2] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=A8=A1=E5=9D=97fromInv?=
=?UTF-8?q?entoryStatus?=
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 2/2] =?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)