Merge branch 'dev' into pre-production

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
+        <where>
-        ldr.is_deleted = 0
+            ldr.is_deleted = 0
-        AND lds.is_deleted = 0
+            AND lds.is_deleted = 0
-        AND ( ldr.reservation_num + ldr.reservation_stock_list_num ) > 0
+            AND ( ldr.reservation_num + ldr.reservation_stock_list_num ) > 0
-        AND date_format( lds.signing_time, '%y%m%d%' ) <= date_format(
+            AND date_format( lds.signing_time, '%y%m%d%' ) &lt;= date_format(
-        '2024-04-28',
+            '2024-04-28',
-        '%y%m%d%')
+            '%y%m%d%')
-        AND lds.signing_status = 2
+            AND lds.signing_status = 2
-        <if test="warehouseIds != null and warehouseIds.size > 0">
+            <if test="warehouseIds != null and warehouseIds.size > 0" >
-            AND ldr.warehouse_id in
+                AND ldr.warehouse_id in
-            <foreach collection="warehouseIds" item="warehouseId" index="index" open="(" close=")" separator=",">
+                <foreach collection="warehouseIds" item="warehouseId" index="index" open="(" close=")" separator=",">
-               #{warehouseId}
+                    #{warehouseId}
-            </foreach>
+                </foreach>
-        </if>
+            </if>
+        </where>
+
         GROUP BY ldr.warehouse_id
     </select>
 </mapper>

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 "成功";
 	}