From 75c0215ffd3ebe2ed85e9ce4e3585a959d617746 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 16 Oct 2024 10:52:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B1=95=E7=A4=BA=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=8A=A5=E8=A1=A8=E7=9A=84=E8=8A=82=E7=82=B9=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockArticleMapper.xml | 2 -- .../impl/DistributionNodeWorkServiceImpl.java | 28 +++++++++---------- .../impl/WarehouseNodeWorkServiceImpl.java | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index ec0ff8bc1..3ce58f7bb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -757,8 +757,6 @@ ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status from logpm_distribution_stock_article ldsa LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id - LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id - LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id ldsa.order_status in ('10','20','30','70') and ldsa.reservation_status in ('10','20') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java index ac596a29f..ba0605ab7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java @@ -43,7 +43,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer public void planReservation(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.reservation.OwnReservation.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.reservation.OwnReservation.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e); } @@ -53,7 +53,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void planDelivery(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e); } @@ -64,7 +64,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void cancelReservation(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.reservation.OwnReservation.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.reservation.OwnReservation.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e); } @@ -74,7 +74,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer public void planStock(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { // 备货信息主表 try { - rabbitTemplate.convertAndSend(FanoutConstants.distribution.stock.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.stock.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e); } @@ -84,7 +84,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void nodeLoading(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e); } @@ -93,7 +93,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void abnormalLoading(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e); } @@ -107,7 +107,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void carStart(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndCarStart.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndCarStart.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e); } @@ -116,7 +116,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void carArrived(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndConsigneeArrive.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndConsigneeArrive.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e); } @@ -129,7 +129,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> nodeFanoutMsg is null！ "); return; } - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndSignfor.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndSignfor.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 签收节点消息推送失败~ 请联系管理员！ ", e); } @@ -168,7 +168,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void signForCheck(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 签收复核消息推送失败~ 请联系管理员！ ", e); } @@ -180,7 +180,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void planOfBill(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillPlan.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillPlan.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 自提计划消息推送失败~ 请联系管理员！ ", e); } @@ -189,7 +189,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void signByBill(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSign.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSign.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 自提签收消息推送失败~ 请联系管理员！ ", e); } @@ -198,7 +198,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void billofladingSignforCheck(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSignReview.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSignReview.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 自提复核消息推送失败~ 请联系管理员！ ", e); } @@ -207,7 +207,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void finishDistributionTrain(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndFinish.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndFinish.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 车次完成消息推送失败~ 请联系管理员！ ", e); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseNodeWorkServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseNodeWorkServiceImpl.java index 0fc112e42..b97398863 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseNodeWorkServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseNodeWorkServiceImpl.java @@ -24,7 +24,7 @@ public class WarehouseNodeWorkServiceImpl implements IWarehouseNodeWorkService { public void returnToTheWarehouse(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { if(nodeFanoutMsg != null){ - rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndReturnWarehouse.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); +// rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndReturnWarehouse.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } } catch (AmqpException e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 回库消息推送失败~ 请联系管理员！ ", e);