From c68231a4988949c7cca2cf7460074c830041360b Mon Sep 17 00:00:00 2001
From: "juncheng.li" <juncheng.li@ccwin-in.com>
Date: Wed, 12 Apr 2023 19:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=90=8E=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/return/purchaseReturn_detail.vue |  6 +--
 fe/PDA/pages/return/returnToWarehouse.vue     | 40 ++++++++++++++-----
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/fe/PDA/pages/return/purchaseReturn_detail.vue b/fe/PDA/pages/return/purchaseReturn_detail.vue
index 4f7b6e2ec..d2a29e775 100644
--- a/fe/PDA/pages/return/purchaseReturn_detail.vue
+++ b/fe/PDA/pages/return/purchaseReturn_detail.vue
@@ -196,9 +196,9 @@
 
 					v.packingCode = v.recommendPackingCode
 					v.qty = v.recommendQty
-					v.uom = v.recommendUom
-					v.locationCode = v.recommendLocationCode,
-						v.lot = v.recommendLot
+					v.uom = v.uom
+					v.locationCode = v.recommendFromLocationCode
+					v.lot = v.recommendLot
 				});
 				this.$forceUpdate();
 			},
diff --git a/fe/PDA/pages/return/returnToWarehouse.vue b/fe/PDA/pages/return/returnToWarehouse.vue
index 5a33fe7fc..56c0d3b98 100644
--- a/fe/PDA/pages/return/returnToWarehouse.vue
+++ b/fe/PDA/pages/return/returnToWarehouse.vue
@@ -258,9 +258,7 @@
 						}
 					});
 					that.getLabel();
-				}
-				else
-				{
+				} else {
 					this.scanPopupGetFocus();
 				}
 			},
@@ -491,10 +489,8 @@
 			getSubmitParam() {
 				let that = this;
 				let item = {
-					company: localStorage.company,
 					number: "",
 					worker: localStorage.userName,
-					warehouseCode: localStorage.warehouseCode,
 					putawayType: 2,
 					details: []
 				}
@@ -509,12 +505,11 @@
 						detail.itemDesc2 = balanceItem.itemDesc2;
 						detail.uom = l.uom;
 						detail.qty = l.qty;
-						detail.stdPackUom = balanceItem.stdPackUom;
 						detail.stdPackQty = balanceItem.stdPackQty;
 
-						detail.fromPackingCode = '';
+						detail.fromPackingCode = l.packingCode;
 						detail.toPackingCode = l.packingCode;
-						detail.fromLot = '';
+						detail.fromLot = l.lot;
 						detail.toLot = l.lot;
 
 						detail.fromLocationCode = that.fromLocation.code;
@@ -539,8 +534,33 @@
 						detail.arriveDate = balanceItem.arriveDate;
 						detail.produceDate = balanceItem.produceDate;
 						detail.expireDate = balanceItem.expireDate;
-
-						detail.poNumber = l.poNumber;
+						//===========================================
+						detail.recommendContainerCode = balanceItem.containerCode;
+						detail.recommendPackingCode = l.packingCode;
+						detail.recommendSupplierBatch = balanceItem.supplierBatch;;
+						detail.recommendArriveDate = balanceItem.arriveDate;
+						detail.recommendProduceDate = balanceItem.produceDate;
+						detail.recommendExpireDate = balanceItem.expireDate;
+						detail.recommendLot = l.lot;
+						detail.recommendToLocationCode = "";
+						detail.recommendToLocationArea = "";
+						detail.recommendToLocationGroup = "";
+						detail.recommendToLocationErpCode = "";
+						detail.recommendToWarehouseCode = balanceItem.warehouseCode;
+						detail.recommendQty = l.qty;
+						detail.handledContainerCode = "";
+						detail.handledPackingCode = "";
+						detail.handledSupplierBatch = "";
+						detail.handledArriveDate = balanceItem.arriveDate;
+						detail.handledProduceDate = balanceItem.produceDate;
+						detail.handledExpireDate = balanceItem.expireDate;
+						detail.handledLot = "";
+						detail.handledToLocationCode = "";
+						detail.handledToLocationArea = "";
+						detail.handledToLocationGroup = "";
+						detail.handledToLocationErpCode = "";
+						detail.handledToWarehouseCode = "";
+						detail.handledQty = l.qty;
 						item.details.push(detail);
 					});
 				})