Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -1202,7 +1202,8 @@
         LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.stock_article_id = ldrs.stock_article_id AND ldrp.reservation_id = ldr.id
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
         WHERE
-        lds.id IN
+        ldrs.reservation_num is not null
+        and lds.id IN
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
@@ -1229,7 +1230,8 @@
         LEFT JOIN logpm_distribution_reservation_stocklist AS ldrs ON ldr.id=ldrs.reservation_id
         LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsl.id=ldrs.stocklist_id
         WHERE
-        lds.id IN
+        ldrs.reservation_num is not null
+        and lds.id IN
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java

@@ -24,7 +24,7 @@ public class OrderDataRepair {
 	 * @param warehouseId
 	 * @return
 	 */
-	@XxlJob("repairOrderSignStatus")
+	@XxlJob("maintenanceOrderStatus")
 	public ReturnT<String> maintenanceOrderStatus(String warehouseId) {
 		log.info("####################OrderDataRepair.maintenanceOrderStatus: 维护订单状态 开始");
 		Boolean flag = distributionStockArticleClient.maintenanceOrderStatus(warehouseId);

blade-service/logpm-trunkline/src/main/resources/application-prod.yml

@@ -29,3 +29,29 @@ spring:
           url: ${blade.datasource.trunkline.slave.url}
           username: ${blade.datasource.trunkline.slave.username}
           password: ${blade.datasource.trunkline.slave.password}
+    #rabbitmq配置
+  rabbitmq:
+    host: 172.16.128.145
+    port: 5672
+    username: admin
+    password: Slwk@123654
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /
+    #确认消息已发送到队列(Queue)
+    publisher-returns: true
+    publisher-confirm-type: correlated
+    # 手动提交消息
+    listener:
+      simple:
+        acknowledge-mode: auto
+        default-requeue-rejected: false
+        retry:
+          enabled: true # 开启消费者失败重试
+          initial-interval: 1000 # 初识的失败等待时长为1秒
+          multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval
+          max-attempts: 3 # 最大重试次数
+          stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false
+      direct:
+        acknowledge-mode: manual
+    template:
+      mandatory: true