修改制品上架任务

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