From 5c450f84404df1f56e5a82d820da13450bf6a588 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 26 Jun 2024 02:36:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=86=85bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oldproject/mapper/AdvanceDetailMapper.xml      |  6 ------
 .../logpm/patch/jobhandle/SyncWarehouseData.java   | 14 +++++++-------
 .../patch/mapper/WarehouseMappingDataMapper.xml    |  6 ++++--
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
index b817aabea..6336a87c1 100644
--- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
+++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
@@ -97,9 +97,6 @@
     <select id="getByUnitNo" resultType="com.logpm.oldproject.vo.DistributionParcelListEntityVO">
         select w.title warehouse,
                od.unitNo packetBarCode,
-               c.title cargoTitle,
-               s.title shelfTitle,
-               l.title goodsAllocation,
                ad.firstPackName firsts,
                ad.secondPackName `second`,
                ad.thirdPackName thirdProduct,
@@ -115,9 +112,6 @@
         from ht_order_detail od
             left join ht_advance_detail ad on ad.unitNo = od.unitNo and ad.delete_time = 0
             left join ht_warehouse w on w.id = od.now_warehouse_id
-            left join ht_location l on od.location_id = l.id
-            left join ht_shelf s on l.shelf_id = s.id
-            left join ht_cargo c on s.cargo_id = c.id
             left join (select unit_no,productcode,productname from ht_detail_product where unit_no= #{unitNo} limit 1) t on t.unit_no = ad.unitNo
         where od.unitNo = #{unitNo}
           and od.delete_time = 0
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java
index f437e1ee6..fffdb91ca 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java
@@ -636,13 +636,13 @@ public class SyncWarehouseData {
 			}
 		});
 
-		delTrayAndAllocationPackageMap.keySet().forEach(warehouseId -> {
-			List<String> list = delTrayAndAllocationPackageMap.get(warehouseId);
-			if(!list.isEmpty()){
-				Set<String> orderPackageCodes = new HashSet<>(list);
-				warehouseUpdownTypeClient.downPackageOrDelTray(StringUtil.join(orderPackageCodes,","),warehouseId,"系统因为签收或者出库下架解托");
-			}
-		});
+//		delTrayAndAllocationPackageMap.keySet().forEach(warehouseId -> {
+//			List<String> list = delTrayAndAllocationPackageMap.get(warehouseId);
+//			if(!list.isEmpty()){
+//				Set<String> orderPackageCodes = new HashSet<>(list);
+//				warehouseUpdownTypeClient.downPackageOrDelTray(StringUtil.join(orderPackageCodes,","),warehouseId,"系统因为签收或者出库下架解托");
+//			}
+//		});
 
 
 		log.info("############syncAllTrayAndAllocation: 处理所有包件零担库存品的托盘库位信息 结束");
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
index abcd68b6a..1d31d9ead 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
@@ -363,7 +363,7 @@
 
     <select id="findZeroTraysInfo" resultType="com.logpm.patch.vo.ZeroTrayInfoVO">
         select lwtg.association_value orderCode,
-               ldpl.warehouse_id warehouseId,
+               lwtg.warehouse_id warehouseId,
                lwt.pallet_name trayName
         from logpm_warehouse_tray_goods lwtg
         left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id
@@ -378,6 +378,7 @@
         left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id
         left join logpm_distribution_stock_list ldsl on ldsl.cargo_number = lwtg.association_value and ldsl.warehouse_id = lwtg.warehouse_id and ldsl.market_id = lwtg.market_id and ldsl.incoming_batch = lwtg.incoming_batch
         where lwtg.association_type = '4'
+        and ldsl.id is not null
     </select>
 
     <select id="findPackageAllocationData" resultType="com.logpm.patch.vo.PackageAllocationInfoVO">
@@ -387,7 +388,7 @@
                lwga.qr_code allocationName,
                ldpl.order_package_status orderPackageStatus
         from logpm_warehouse_updown_goods lwug
-         left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = lwtg.association_value and ldpl.warehouse_id = lwtg.warehouse_id
+         left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = lwug.association_value and ldpl.warehouse_id = lwug.warehouse_id
          left join logpm_warehouse_goods_allocation lwga on lwga.id = lwug.allocation_id
         where lwug.association_type = '3'
     </select>
@@ -409,6 +410,7 @@
          left join logpm_warehouse_goods_allocation lwga on lwga.id = lwug.allocation_id
          left join logpm_distribution_stock_list ldsl on ldsl.cargo_number = lwug.association_value and ldsl.warehouse_id = lwug.warehouse_id and ldsl.market_id = lwug.market_id and ldsl.incoming_batch = lwug.incoming_batch
         where lwug.association_type = '4'
+          and ldsl.id is not null
     </select>
 
 </mapper>