From 93f8a0f58332c2f9a9f65dc34c905b1bf0b0e477 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 26 Nov 2024 10:29:19 +0800
Subject: [PATCH] =?UTF-8?q?YT-1172=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=E8=A6=81=E6=94=AF=E6=8C=81=E6=89=AB?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=E6=A0=87=E7=AD=BE=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=E4=B8=8D=E8=83=BD=E5=8F=98?=
 =?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/unPlanned/job/receiptJobDetail.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index 5b5fe2d3..2976ea12 100644
--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@@ -256,6 +256,12 @@
 				}
 				
 			},
+			
+			getTodayDate() {
+			  var today = new Date(); // 创建Date对象
+			  var dateString =today.getTime(); // 拼接成日期字符串
+			  return dateString;
+			},
 			setDataBatch(result){
 				try {
 					console.log(222,result)
@@ -281,6 +287,10 @@
 								r.fromLocationCode == result.fromLocationCode&&
 								r.isRecommend==true
 						})
+						if(!itemDetail1){
+							itemDetail1 = {...result.package,masterId:this.jobContent.id}
+						}
+						console.log(itemDetail1)
 						if (itemDetail == undefined) {
 							// this.showErrorMessage("批次【" + batch + "】" + "不在列表中")
 							var newAdd = {
@@ -291,13 +301,14 @@
 								handleQty:Number(result.label.qty),
 								qty:detail.qty,
 								toLocationCode:this.toLocationCode ? this.toLocationCode : this.jobToLocationCode,
-								// inventoryStatus:inventoryStatus,
-								// toInventoryStatus:inventoryStatus,
+								inventoryStatus:'OK',
+								toInventoryStatus:'OK',
 								packQty:Number(result.package.packQty),
 								packUnit:result.package.packUnit,
 								balance:{},
 								isRecommend:false,
-								isNewAdd:"newAdd"
+								isNewAdd:"newAdd",
+								arriveDate:itemDetail1.arriveDate||this.getTodayDate()
 							}
 							// newAdd.balance.balanceQty = Number(result.balance.qty);
 							newAdd.balance.packQty = Number(result.package.packQty)
@@ -313,9 +324,10 @@
 								itemDetail.handleQty = Number(result.label.qty);
 								itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail
 									.toLocationCode;
-								itemDetail.packQty = Number(result.package.packQty)
+								itemDetail.packQty = Number(result.package.SpackQty)
 								itemDetail.packUnit = result.package.packUnit
 								itemDetail.labelQty = Number(result.label.qty);
+								itemDetail.expireDate=result.package.expireDate,
 								
 								itemDetail.balance={}
 								itemDetail.balance.packQty = Number(result.package.packQty)