From a9ab9c02eb2e1914955839423c8530322913d4b0 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 16 Dec 2023 23:46:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E8=80=81=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oldproject/service/impl/TrayScanDesServiceImpl.java  | 2 +-
 .../logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml  | 6 +++---
 .../logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml   | 2 +-
 .../service/impl/WarehouseTrayTypeServiceImpl.java       | 9 +++++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java
index b26981653..b93d58c11 100644
--- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java
+++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java
@@ -53,7 +53,7 @@ public class TrayScanDesServiceImpl implements ITrayScanDesService {
 		QueryWrapper<TrayScanDesEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("now_warehouse_id",oldWarehouseId)
 			.eq("type",1)
-			.eq("trayId",trayId);
+			.eq("tray_id",trayId);
 		return trayScanDesMapper.selectList(queryWrapper);
 	}
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
index f67be2fa4..5fc96ade0 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
@@ -356,7 +356,7 @@
                lwtg.num num
         from logpm_warehouse_tray_goods lwtg
         left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = lwtg.association_value
-        where lwtg.tray_code = #{tray_code}
+        where lwtg.tray_code = #{trayCode}
         and lwtg.association_type = '3'
     </select>
 
@@ -366,7 +366,7 @@
                lwtg.num num
         from logpm_warehouse_tray_goods lwtg
          left join logpm_distribution_stock_article ldsa on ldsa.order_code = lwtg.association_value
-        where lwtg.tray_code = #{tray_code}
+        where lwtg.tray_code = #{trayCode}
           and lwtg.association_type = '1'
     </select>
 
@@ -377,7 +377,7 @@
                lwtg.num num
         from logpm_warehouse_tray_goods lwtg
         left join logpm_distribution_stock_list ldsl on ldsl.incoming_batch = lwtg.incoming_batch and ldsl.cargo_number = lwtg.association_value and ldsl.market_name = lwtg.market_name
-        where lwtg.tray_code = #{tray_code}
+        where lwtg.tray_code = #{trayCode}
           and lwtg.association_type = '4'
     </select>
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
index f6e643aa8..26fa1b24a 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
@@ -94,7 +94,7 @@
         select ldpl.waybill_number waybillNo,
                ldpl.order_code orderCode,
                ldpl.order_package_code orderPackageCode,
-               ldpl.num num
+               ldpl.quantity num
         from logpm_distribution_parcel_list ldpl
         where 1=1
         and ldpl.order_package_code in
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index b77e7f8cb..47ebd8c76 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -2823,9 +2823,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			trayTypeVO.setOrderTotalNum(0);
 			trayTypeVO.setStockNum(0);
 			trayTypeVO.setStockTotalNum(0);
+			trayTypeVO.setTrayType("100");
+			trayTypeVO.setTrayTypeName("其他");
 		}else{
+			String trayType = trayTypeEntity.getTrayType();
+			String value = DictBizCache.getValue("pallet_order_type", trayType);
 			BeanUtil.copy(trayTypeEntity,trayTypeVO);
 			trayTypeVO.setTrayName(trayEntity.getPalletName());
+			trayTypeVO.setTrayTypeName(value);
 		}
 
 		List<OrderPackageInfoVO> packageList = warehouseTrayGoodsService.findOrderPackageCodeInfoList(trayCode);
@@ -2852,13 +2857,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			log.warn("###########findSyncTrayData: 托盘信息不存在 trayCode={}",trayCode);
 			return R.fail(405,"托盘信息不存在");
 		}
-		Integer oldTrayId = trayEntity.getOldId();
+		Integer trayId = trayEntity.getOldId();
 
 		Map<String,Object> map = new HashMap<>();
 		//查询所有托盘包件信息
 		Set<String> set = new TreeSet<>();
 		List<String> orderPackageList = new ArrayList<>();
-		List<TrayScanDesEntity> trayScanDesEntityList = trayScanDesClient.findListByTrayId(oldTrayId, oldWarehouseId);
+		List<TrayScanDesEntity> trayScanDesEntityList = trayScanDesClient.findListByTrayId(trayId, oldWarehouseId);
 		if(trayScanDesEntityList.size() == 0){
 			return R.data(map);
 		}