From ef02edc663c923ba0f3efb17be1a620d42411f49 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 17 Dec 2024 14:20:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=AE=9A=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/DistributionStockupAppController.java   | 10 ----------
 .../mapper/DistributionStockupMapper.xml        |  6 +++---
 .../impl/DistributionStockupServiceImpl.java    | 17 +++++++++--------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java
index 9b800d282..6478caf2e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java
@@ -103,25 +103,15 @@ public class DistributionStockupAppController extends BladeController {
 	private final IDistributionReservationStocklistService distributionReservationStocklistService;
 	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
 
-	private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
-	private final IDistributionAsyncService distributionAsyncService;
 	private final DistributionReservationMapper distributionReservationMapper;
 	private final IDisStockListDetailService disStockListDetailService;
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
 
-	private final RabbitTemplate rabbitTemplate;
-
-
 	private final IDistributionStockListService distributionStockListService;
 
-
-	private final IDisStockOrdercodeRecoService disStockOrdercodeRecoService;
 	private final IDistributionReservationStockarticleService distributionReservationStockarticleService;
-	private final IWarehouseUpdownStockUpAreaClient warehouseUpdownStockUpAreaClient;
 
 	private final BladeRedis redis;
-	private final ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
-	private final IDistributionNodeWorkService distributionNodeWorkService;
 	private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService;
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index f975f88e6..98bf14b25 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -61,9 +61,9 @@
         <where>
             ldsi.reservation_id = #{param.reservationId} and ldsi.stockup_id = #{param.stockupId}
             and ldpl.order_package_code = #{param.packetBarCode}
-            <if test="param.orderCode != '' and param.orderCode != null">
-                and ldpl.order_code = #{param.orderCode}
-            </if>
+<!--            <if test="param.orderCode != '' and param.orderCode != null">-->
+<!--                and ldpl.order_code = #{param.orderCode}-->
+<!--            </if>-->
         </where>
 
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index f734dfa95..318567b00 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -2196,19 +2196,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					case 1:
 						//订单
 						String orderCode = stockupDTO.getOrderCode();
-						QueryWrapper<DistributionStockEntity> queryWrapper = new QueryWrapper<>();
-						if (stockupDTO.getOrderCode().contains(",")) {
-							stockupDTO.setOrderCodeList(stockupDTO.getOrderCode().split(","));
-							queryWrapper.in("order_self_numbering", stockupDTO.getOrderCodeList());
-							stockupDTO.setOrderCode(null);
-						} else {
-							queryWrapper.eq("order_self_numbering", orderCode);
-						}
+//						QueryWrapper<DistributionStockEntity> queryWrapper = new QueryWrapper<>();
+//						if (stockupDTO.getOrderCode().contains(",")) {
+//							stockupDTO.setOrderCodeList(stockupDTO.getOrderCode().split(","));
+//							queryWrapper.in("order_self_numbering", stockupDTO.getOrderCodeList());
+//							stockupDTO.setOrderCode(null);
+//						} else {
+//							queryWrapper.eq("order_self_numbering", orderCode);
+//						}
 						String packetBarCode = stockupDTO.getPacketBarCode();
 						Integer integer = baseMapper.selectPackageExist(stockupDTO);
 						//查询包件信息
 						if (ObjectUtils.isNotNull(integer) && integer > 0) {
 							//存在
+							QueryWrapper<DistributionStockEntity> queryWrapper = new QueryWrapper<>();
 							queryWrapper.eq("coding", packetBarCode);
 							queryWrapper.eq("stockup_id", stockupId);
 							queryWrapper.eq("reservation_id", reservationId);