From 3267c9dd4f7421debefd588177343e74a7a003be Mon Sep 17 00:00:00 2001
From: Niext <85552560@qq.com>
Date: Thu, 30 May 2024 21:14:37 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scan/winScanPackAndLocation.vue | 46 +++---
src/pages/purchaseReturn/job/returnDetail.vue | 148 ++++++++++--------
2 files changed, 110 insertions(+), 84 deletions(-)
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 8996b173..6c6b5275 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -88,7 +88,7 @@
type: Boolean,
default: false
},
- //不提示库存
+ //不提示库存错误
noShowBalanceMessage: {
type: Boolean,
default: false
@@ -102,6 +102,10 @@
type: String,
default: "HPQ,HMQ"
},
+ queryBalance: {
+ type: Boolean,
+ default: true
+ }
},
data() {
return {
@@ -246,23 +250,27 @@
checkPackage(result) {
if (result.label != null) {
this.scanResult = result;
- // uni.showLoading({
- // title: '查询中...',
- // mask: true
- // })
- getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
- res => {
- uni.hideLoading();
- if (res.success) {
- this.managementPrecision = res.managementPrecision
- this.afterQueryBalance(res.data.list);
- } else {
- this.showErrorMessage(res.message, res => {
- this.packGetFocus();
- })
- }
- // uni.hideLoading();
- });
+ if (this.queryBalance == true) {
+ // uni.showLoading({
+ // title: '查询中...',
+ // mask: true
+ // })
+ getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
+ res => {
+ uni.hideLoading();
+ if (res.success) {
+ this.managementPrecision = res.managementPrecision
+ this.afterQueryBalance(res.data.list);
+ } else {
+ this.showErrorMessage(res.message, res => {
+ this.packGetFocus();
+ })
+ }
+ // uni.hideLoading();
+ });
+ } else {
+ this.packCallBack(null);
+ }
}
},
@@ -448,4 +456,4 @@
height: auto;
max-height: 300rpx;
}
-
\ No newline at end of file
+
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index f982cf88..501f1126 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -35,7 +35,7 @@
-
+
@@ -225,6 +225,7 @@
getScanResult(result) {
try {
+ debugger;
var packingNumber = result.label.packingNumber;
var batch = result.label.batch;
var qty = result.label.qty;
@@ -240,77 +241,94 @@
r.batch == batch &&
r.fromLocationCode == result.fromLocationCode
})
- let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+ // let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
//不存在提示
if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
- .fromLocationCode + "】
状态【" + balanceStatus + "】
未找到记录")
+ .fromLocationCode + "】
未找到明细")
return;
} else {
- itemDetail = detail.subList.find(r => {
- return r.packingNumber == packingNumber &&
- r.batch == batch &&
- r.fromLocationCode == result.fromLocationCode &&
- r.inventoryStatus == result.balance.inventoryStatus
- })
- //箱码、批次、库位、状态不一致
- if (itemDetail == undefined) {
- itemDetail = detail.subList.find(r => {
- return r.packingNumber == packingNumber &&
- r.batch == batch &&
- r.fromLocationCode == result.fromLocationCode
- })
- if (itemDetail.scaned) {
- this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
- .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描")
- return;
- }
-
- let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
- if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续退货?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty);
- itemDetail.toInventoryStatus = result.balance.inventoryStatus;
- itemDetail.inventoryStatus =result.balance.inventoryStatus;
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.packQty = result.package.packQty
- itemDetail.balance.packUnit = result.package.packUnit
- this.calcHandleQty();
- } else {
- this.scanPopupGetFocus();
- }
- });
- } else {
- this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
- itemStatus +
- ']不一致,不允许转移!', res => {
- this.scanPopupGetFocus();
- });
- }
-
-
+ if (itemDetail.scaned) {
+ this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
+ .fromLocationCode + "】已经扫描")
+ return;
} else {
- // 箱码、批次、库位、状态一致
- if (itemDetail.scaned) {
- this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
- .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描")
- return;
- } else {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty);
- itemDetail.toInventoryStatus = result.balance.inventoryStatus;
- itemDetail.inventoryStatus =result.balance.inventoryStatus;
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = Number(result.balance.qty);
- itemDetail.balance.packQty = Number(result.package.packQty)
- itemDetail.balance.packUnit = result.package.packUnit
- this.calcHandleQty();
- }
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.label.qty);
+
+ itemDetail.toInventoryStatus = itemDetail.inventoryStatus;
+
+ // itemDetail.balance = result.balance;
+ // itemDetail.balance.balanceQty = Number(result.balance.qty);
+ // itemDetail.balance.packQty = Number(result.package.packQty)
+ // itemDetail.balance.packUnit = result.package.packUnit
+ // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ // itemDetail.inventoryStatus =result.balance.inventoryStatus;
+ // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ // itemDetail.inventoryStatus =result.balance.inventoryStatus;
+ // itemDetail.balance = result.balance;
+ // itemDetail.balance.balanceQty = Number(result.balance.qty);
+ // itemDetail.balance.packQty = Number(result.package.packQty)
+ // itemDetail.balance.packUnit = result.package.packUnit
+ this.calcHandleQty();
}
+
+
+ // if (itemDetail == undefined) {
+ // itemDetail = detail.subList.find(r => {
+ // return r.packingNumber == packingNumber &&
+ // r.batch == batch &&
+ // r.fromLocationCode == result.fromLocationCode
+ // })
+ // if (itemDetail.scaned) {
+ // this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
+ // .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描")
+ // return;
+ // }
+
+ // let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+ // if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+ // this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ // ']不一致,是否继续退货?', res => {
+ // if (res) {
+ // itemDetail.scaned = true;
+ // itemDetail.handleQty = Number(result.balance.qty);
+ // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ // itemDetail.inventoryStatus =result.balance.inventoryStatus;
+ // itemDetail.balance = result.balance;
+ // itemDetail.balance.balanceQty = result.balance.qty;
+ // itemDetail.balance.packQty = result.package.packQty
+ // itemDetail.balance.packUnit = result.package.packUnit
+ // this.calcHandleQty();
+ // } else {
+ // this.scanPopupGetFocus();
+ // }
+ // });
+ // } else {
+ // this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+ // itemStatus +
+ // ']不一致,不允许转移!', res => {
+ // this.scanPopupGetFocus();
+ // });
+ // }
+ // } else {
+ // // 箱码、批次、库位、状态一致
+ // if (itemDetail.scaned) {
+ // this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
+ // .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描")
+ // return;
+ // } else {
+ // itemDetail.scaned = true;
+ // itemDetail.handleQty = Number(result.balance.qty);
+ // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ // itemDetail.inventoryStatus =result.balance.inventoryStatus;
+ // itemDetail.balance = result.balance;
+ // itemDetail.balance.balanceQty = Number(result.balance.qty);
+ // itemDetail.balance.packQty = Number(result.package.packQty)
+ // itemDetail.balance.packUnit = result.package.packUnit
+ // this.calcHandleQty();
+ // }
+ // }
}
From 74d4fbc25652d9fbea3781701e7a45c721af04fb Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 31 May 2024 08:34:28 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E6=96=AD=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/purchaseReturn/job/returnDetail.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index 501f1126..9682998b 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -225,7 +225,6 @@
getScanResult(result) {
try {
- debugger;
var packingNumber = result.label.packingNumber;
var batch = result.label.batch;
var qty = result.label.qty;
From 8f11fe53e16b4066bfda3980b3baff9207110c6e Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 31 May 2024 15:51:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=9APDA=E9=87=87?=
=?UTF-8?q?=E8=B4=AD=E9=80=80=E8=B4=A7=E4=BB=BB=E5=8A=A1=E4=B8=AD=E6=95=B0?=
=?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA=E4=B8=B2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/item/itemCompareQty.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index 4779ba7f..560137b4 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -3,7 +3,7 @@