From 4d96be6fc59f58235fc2c29ec1ae09fa49312288 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 17 Jan 2025 08:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/record/productionReturn.vue     | 46 +++++++++++++++++---
 fe/PDA/pages/record/productionReturnPack.vue | 41 +++++++++++++++--
 2 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/fe/PDA/pages/record/productionReturn.vue b/fe/PDA/pages/record/productionReturn.vue
index 7537549ba..c8240c0fb 100644
--- a/fe/PDA/pages/record/productionReturn.vue
+++ b/fe/PDA/pages/record/productionReturn.vue
@@ -229,15 +229,15 @@
 						}]
 					},
 					Sorting: "",
-					SkipCount: (data.pageIndex-1)*data.pageSize,
+					SkipCount: (data.pageIndex - 1) * data.pageSize,
 					MaxResultCount: data.pageSize
 				}
 				return getCustomerList(params);
 			},
-			
-			selectCheckbox(mode, resultData){
+
+			selectCheckbox(mode, resultData) {
 				console.log(mode, resultData)
-				this.customerCode =resultData.code
+				this.customerCode = resultData.code
 			},
 
 			getScanResult(result) {
@@ -365,16 +365,52 @@
 				}
 				this.allDataList.forEach(res => {
 					var detail = {
+						recommendContainerCode: "",
+						recommendPackingCode: "",
+						recommendSupplierBatch: "",
+						recommendLot: "",
+						recommendToLocationCode: "",
+						recommendToLocationArea: "",
+						recommendToLocationGroup: "",
+						recommendToLocationErpCode: "",
+						recommendToWarehouseCode: "",
+						recommendQty: 33,
+						toContainerCode: "",
+						fromContainerCode: "",
+						handledContainerCode: "",
+						fromLot: "",
+						fromStatus: 2,
+						toStatus: 2,
+						fromLocationCode: "",
+						fromLocationArea: "",
+						fromLocationGroup: "",
+						fromLocationErpCode: "",
+						fromWarehouseCode: localStorage.warehouseCode,
+
 						itemCode: res.itemCode,
 						itemName: res.itemName,
 						itemDesc1: res.itemDesc1,
 						uom: res.uom,
 						qty: res.qty,
 						stdPackQty: res.stdPackQty,
+						fromPackingCode: "",
+						toPackingCode: "",
+						toLot: "",
+						supplierBatch: "",
 						toLocationCode: this.toLocationCode,
 						toLocationArea: this.toLocationInfo.areaCode,
 						toLocationGroup: this.toLocationInfo.locationGroupCode,
-						toLocationErpCode: this.toLocationInfo.erpLocationCode
+						toLocationErpCode: this.toLocationInfo.erpLocationCode,
+						toWarehouseCode: localStorage.warehouseCode,
+						handledPackingCode: "",
+						handledSupplierBatch: null,
+						handledLot: "",
+						handledToLocationCode: this.toLocationCode,
+						handledToLocationArea: this.toLocationInfo.areaCode,
+						handledToLocationGroup:this.toLocationInfo.locationGroupCode,
+						handledToLocationErpCode: this.toLocationInfo.erpLocationCode,
+						handledToWarehouseCode: localStorage.warehouseCode,
+						handledQty: res.qty
 					}
 					item.details.push(detail)
 				})
diff --git a/fe/PDA/pages/record/productionReturnPack.vue b/fe/PDA/pages/record/productionReturnPack.vue
index 7c8df0cf0..0c2f9e3a6 100644
--- a/fe/PDA/pages/record/productionReturnPack.vue
+++ b/fe/PDA/pages/record/productionReturnPack.vue
@@ -377,21 +377,54 @@
 				}
 				this.allDataList.forEach(res => {
 					var detail = {
+						
+						recommendContainerCode: "",
+						recommendPackingCode: "",
+						recommendSupplierBatch: "",
+						recommendLot: "",
+						recommendToLocationCode: "",
+						recommendToLocationArea: "",
+						recommendToLocationGroup: "",
+						recommendToLocationErpCode: "",
+						recommendToWarehouseCode: "",
+						recommendQty: 33,
+						toContainerCode: "",
+						fromContainerCode: "",
+						handledContainerCode: "",
+						fromLot: "",
+						fromStatus: 2,
+						toStatus: 2,
+						fromLocationCode: "",
+						fromLocationArea: "",
+						fromLocationGroup: "",
+						fromLocationErpCode: "",
+						fromWarehouseCode: localStorage.warehouseCode,
+						
 						itemCode: res.itemCode,
 						itemName: res.itemName,
 						itemDesc1: res.itemDesc1,
 						uom: res.uom,
 						qty: res.qty,
 						stdPackQty: res.stdPackQty,
+						fromPackingCode: res.packingCode,
+						toPackingCode: res.packingCode,
+						toLot: res.lot,
+						supplierBatch: "",
 						toLocationCode: this.toLocationCode,
 						toLocationArea: this.toLocationInfo.areaCode,
 						toLocationGroup: this.toLocationInfo.locationGroupCode,
 						toLocationErpCode: this.toLocationInfo.erpLocationCode,
-						recommendPackingCode: res.packingCode,
-						recommendLot: res.lot,
-						handledPackingCode: res.packingCode,
+						toWarehouseCode: localStorage.warehouseCode,
+						handledPackingCode:res.packingCode,
+						handledSupplierBatch: null,
 						handledLot: res.lot,
-						handledQty:res.qty
+						handledToLocationCode: this.toLocationCode,
+						handledToLocationArea: this.toLocationInfo.areaCode,
+						handledToLocationGroup:this.toLocationInfo.locationGroupCode,
+						handledToLocationErpCode: this.toLocationInfo.erpLocationCode,
+						handledToWarehouseCode: localStorage.warehouseCode,
+						handledQty: res.qty
+						
 					}
 					item.details.push(detail)
 				})