From 8b8ad96dce90b8c8e55e2f19120b70416191c065 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 13 Jun 2024 15:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=93=81=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/productPutawayDetail.vue              | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 0ae80cc1..646b5250 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -298,41 +298,26 @@
 									.fromLocationCode + "】已经扫描")
 							} else {
 
-								this.addDetail(itemDetail, result);
-								return;
+								// this.addDetail(itemDetail, result);
+								// return;
+								
 								//暂时先不判断状态
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+									// if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
 										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续上架?', res => {
 												if (res) {
 													this.addDetail(itemDetail, result);
-													// itemDetail.scaned = true;
-													// itemDetail.handleQty = Number(result.balance.qty)
-													// itemDetail.toInventoryStatus = 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();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
 									}
-								} else {
-									this.addDetail(itemDetail, result);
-									// itemDetail.scaned = true;
-									// itemDetail.handleQty = Number(result.balance.qty)
-									// itemDetail.balance = result.balance;
-									// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-									// itemDetail.balance.balanceQty = Number(result.balance.qty)
-									// itemDetail.balance.packQty = Number(result.package.packQty)
-									// itemDetail.balance.packUnit = result.package.packUnit
-									// this.calcHandleQty();
-								}
+								// } else {
+								// 	this.addDetail(itemDetail, result);
+								// }
 							}
 						}
 					}
@@ -346,6 +331,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