diff --git a/fe/PDA/pages/return/returnToWarehouse.vue b/fe/PDA/pages/return/returnToWarehouse.vue
index 30e79eb18..9ad3c508b 100644
--- a/fe/PDA/pages/return/returnToWarehouse.vue
+++ b/fe/PDA/pages/return/returnToWarehouse.vue
@@ -494,7 +494,7 @@
 					putawayType: 2,
 					details: []
 				}
-
+				
 				that.itemList.forEach(i => {
 					let balanceItem = i.balanceItem;
 					i.labelList.forEach(l => {
@@ -507,9 +507,9 @@
 						detail.qty = l.qty;
 						detail.stdPackQty = balanceItem.stdPackQty;
 
-						detail.fromPackingCode = l.packingCode;
+						detail.fromPackingCode = balanceItem.packingCode;
 						detail.toPackingCode = l.packingCode;
-						detail.fromLot = l.lot;
+						detail.fromLot = balanceItem.lot;
 						detail.toLot = l.lot;
 
 						detail.fromLocationCode = that.fromLocation.code;
@@ -525,37 +525,39 @@
 							.erpLocationCode;
 
 						detail.fromStatus = balanceItem.status;
-						detail.toStatus = balanceItem.status;
+						detail.toStatus = l.status;
 
-						detail.fromWarehouseCode = balanceItem.warehouseCode;
-						detail.toWarehouseCode = balanceItem.warehouseCode;
+						detail.fromWarehouseCode = localStorage.warehouseCode;
+						detail.toWarehouseCode = localStorage.warehouseCode;
 
 						detail.supplierBatch = balanceItem.supplierBatch;
 						detail.arriveDate = balanceItem.arriveDate;
 						detail.produceDate = balanceItem.produceDate;
 						detail.expireDate = balanceItem.expireDate;
 						//===========================================
-						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.recommendContainerCode = that.fromLocation.code;
+						detail.recommendPackingCode = balanceItem.packingCode;
+						detail.recommendSupplierBatch = l.supplierBatch;
+						detail.recommendArriveDate = l.arriveDate;
+						detail.recommendProduceDate = l.produceDate;
+						detail.recommendExpireDate = l.expireDate;
+						detail.recommendLot = balanceItem.lot;;
 						detail.recommendToLocationCode = l.toLocationCode ?? that.defaultToLocation.code;
 						detail.recommendToLocationArea = l.toLocationArea ?? that.defaultToLocation.areaCode;
 						detail.recommendToLocationGroup = l.toLocationGroup ?? that.defaultToLocation
 							.locationGroupCode;
 						detail.recommendToLocationErpCode =  l.toLocationErpCode ?? that.defaultToLocation
 							.erpLocationCode;
-						detail.recommendToWarehouseCode = balanceItem.warehouseCode;
-						detail.recommendQty = l.qty;
-						detail.handledContainerCode = balanceItem.containerCode;
+						detail.recommendToWarehouseCode = localStorage.warehouseCode;
+						detail.recommendQty = balanceItem.qty;
+						
+						
+						detail.handledContainerCode = l.containerCode;
 						detail.handledPackingCode = l.packingCode;
-						detail.handledSupplierBatch = balanceItem.supplierBatch;
-						detail.handledArriveDate = balanceItem.arriveDate;
-						detail.handledProduceDate = balanceItem.produceDate;
-						detail.handledExpireDate = balanceItem.expireDate;
+						detail.handledSupplierBatch = l.supplierBatch;
+						detail.handledArriveDate = l.arriveDate;
+						detail.handledProduceDate = l.produceDate;
+						detail.handledExpireDate = l.expireDate;
 						detail.handledLot =  l.lot;
 						detail.handledToLocationCode = l.toLocationCode ?? that.defaultToLocation.code;
 						detail.handledToLocationArea = l.toLocationArea ?? that.defaultToLocation.areaCode;
@@ -563,7 +565,7 @@
 							.locationGroupCode;
 						detail.handledToLocationErpCode =  l.toLocationErpCode ?? that.defaultToLocation
 							.erpLocationCode;
-						detail.handledToWarehouseCode = balanceItem.warehouseCode;
+						detail.handledToWarehouseCode = localStorage.warehouseCode;
 						detail.handledQty = l.qty;
 						item.details.push(detail);
 					});
diff --git a/fe/PDA/pages/task/count_detail.vue b/fe/PDA/pages/task/count_detail.vue
index 406fc3039..50c7707ff 100644
--- a/fe/PDA/pages/task/count_detail.vue
+++ b/fe/PDA/pages/task/count_detail.vue
@@ -37,7 +37,7 @@
 												<uni-th width="100" align="center">盘点</uni-th>
 											</uni-tr>
 											<uni-tr>
-												<uni-th width="100">数量({{item.inventoryUom}})</uni-th>
+												<uni-th width="100">数量({{item.uom}})</uni-th>
 												<uni-th width="100" align="center">
 													<text class="text_black">{{item.inventoryQty}}</text>
 												</uni-th>
@@ -430,7 +430,7 @@
 					number: this.datacontent.number,
 
 					inventoryQty: 0,
-					inventoryUom: result.data.uom,
+					uom: result.data.uom,
 
 					packingCode: result.data.packingCode,
 					lot: result.data.lot,