From 744648348f0c1a08f51bd975f4b72f6f26ab102e Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 18 Mar 2024 21:21:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/patch/jobhandle/OrderDataRepair.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java index 4a25ca395..7afa86fc0 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java +++ b/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 maintenanceOrderStatus(String warehouseId) { log.info("####################OrderDataRepair.maintenanceOrderStatus: 维护订单状态 开始"); Boolean flag = distributionStockArticleClient.maintenanceOrderStatus(warehouseId); From c8ed1833555347035d91f29beddf687c6e27d295 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 18 Mar 2024 23:29:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockupMapper.xml | 6 +++-- .../src/main/resources/application-prod.yml | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) 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 4ffedc255..79d4c0cfe 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 @@ -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 #{id} @@ -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 #{id} diff --git a/blade-service/logpm-trunkline/src/main/resources/application-prod.yml b/blade-service/logpm-trunkline/src/main/resources/application-prod.yml index c89d9bbbc..b0a067516 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-prod.yml +++ b/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