From afe13c686bbeae5a92d80e7fb7bee4f74d743a7b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 28 Apr 2024 20:06:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionSignforMapper.xml      | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 9fd18d52a..7a6740736 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -1387,20 +1387,22 @@
         FROM
         logpm_distribution_reservation AS ldr
         LEFT JOIN logpm_distribution_signfor AS lds ON ldr.id = lds.reservation_id
-        WHERE
-        ldr.is_deleted = 0
-        AND lds.is_deleted = 0
-        AND ( ldr.reservation_num + ldr.reservation_stock_list_num ) > 0
-        AND date_format( lds.signing_time, '%y%m%d%' ) <= date_format(
-        '2024-04-28',
-        '%y%m%d%')
-        AND lds.signing_status = 2
-        <if test="warehouseIds != null and warehouseIds.size > 0">
-            AND ldr.warehouse_id in
-            <foreach collection="warehouseIds" item="warehouseId" index="index" open="(" close=")" separator=",">
-               #{warehouseId}
-            </foreach>
-        </if>
+        <where>
+            ldr.is_deleted = 0
+            AND lds.is_deleted = 0
+            AND ( ldr.reservation_num + ldr.reservation_stock_list_num ) > 0
+            AND date_format( lds.signing_time, '%y%m%d%' ) &lt;= date_format(
+            '2024-04-28',
+            '%y%m%d%')
+            AND lds.signing_status = 2
+            <if test="warehouseIds != null and warehouseIds.size > 0" >
+                AND ldr.warehouse_id in
+                <foreach collection="warehouseIds" item="warehouseId" index="index" open="(" close=")" separator=",">
+                    #{warehouseId}
+                </foreach>
+            </if>
+        </where>
+
         GROUP BY ldr.warehouse_id
     </select>
 </mapper>

From e8959e8499170e6532b6412b748109f147a38837 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Sun, 28 Apr 2024 20:36:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=87=91?=
 =?UTF-8?q?=E7=89=8C=E6=B6=88=E6=81=AF=E7=AE=A1=E9=81=93=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jinpai/service/impl/DeliveryNoteServiceImpl.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
index 02a411ccf..2ac25ced9 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
@@ -64,7 +64,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 
 		// 3 将消息发送给 mq，解析保存
 		SendMsg build = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.FACTORY_ORDER)
-			.routingKey(FactoryDataConstants.Mq.RoutingKeys.SFY_FACTORY_ORDER).message(JSONUtil.toJsonStr(logEntity)).build();
+			.routingKey(FactoryDataConstants.Mq.RoutingKeys.JP_FACTORY_ORDER).message(JSONUtil.toJsonStr(logEntity)).build();
 		factoryDataClient.sendMessage(build);
 		return "成功";
 	}
@@ -83,7 +83,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 
 		// 3 将消息发送给 mq，解析保存
 		SendMsg build = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.FACTORY_ORDER)
-			.routingKey(FactoryDataConstants.Mq.RoutingKeys.SFY_FACTORY_ORDER).message(JSONUtil.toJsonStr(logEntity)).build();
+			.routingKey(FactoryDataConstants.Mq.RoutingKeys.JP_FACTORY_ORDER).message(JSONUtil.toJsonStr(logEntity)).build();
 		factoryDataClient.sendMessage(build);
 		return "成功";
 	}
@@ -101,7 +101,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		factoryOrderLogService.save(logEntity);
 		// 3 将消息发送给 mq，解析保存
 		SendMsg build = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.FACTORY_ORDER)
-			.routingKey(FactoryDataConstants.Mq.RoutingKeys.SFY_FACTORY_ORDER).message(JSONUtil.toJsonStr(logEntity)).build();
+			.routingKey(FactoryDataConstants.Mq.RoutingKeys.JP_FACTORY_ORDER).message(JSONUtil.toJsonStr(logEntity)).build();
 		factoryDataClient.sendMessage(build);
 		return "成功";
 	}