From 026f17ece1afe0c28815967085622fd0b1bd6e38 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 7 Nov 2024 17:56:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=87=AA=E6=8F=90=E5=A4=8D?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改自提复核志邦我乐存在多次发送消息的情况 --- .../impl/DistributionAsyncServiceImpl.java | 109 +++++++++--------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 95bd7408e..9d7c75ada 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -3413,60 +3413,61 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } } - if ("我乐".equals(k)) { - List orderList3 = orderMap.get(k); - - List ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.query().lambda() - .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) - .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList())) - ); - List contents = new ArrayList<>(); - if (!ladingScanEntities.isEmpty()) { - Map> listMap = orderList3.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getOrderCode)); - for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { - PushData pushData = PushData.builder() - .packageCode(ladingScanEntity.getPacketBarCode()) - .orderCode(ladingScanEntity.getOrderSelfNumbering()) - .warehouseName(warehouse.getName()) - .waybillNumber(listMap.get(ladingScanEntity.getOrderSelfNumbering()).get(0).getWaybillNumber()).build(); - contents.add(pushData); - } - } - NodePushMsg msg = new NodePushMsg(); - msg.setNode(WorkNodeEnums.CLERK_REVIEW); - msg.setBrand(BrandEnums.OLO); - msg.setOperator(user.getNickName()); - msg.setOperatorTime(new Date()); - msg.setContent(contents); - log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg)); - factoryDataMessageSender.sendNodeDataByBrand(msg); - } - - - if ("志邦".equals(k)) { - List orderList3 = orderMap.get(k); - - List ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.query().lambda() - .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) - .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList())) - ); - List contents = new ArrayList<>(); - if (!ladingScanEntities.isEmpty()) { - for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("packageCode", ladingScanEntity.getPacketBarCode()); - contents.add(jsonObject); - } - } - NodePushMsg msg = new NodePushMsg(); - msg.setNode(WorkNodeEnums.CLERK_REVIEW); - msg.setBrand(BrandEnums.ZB); - msg.setOperator(user.getNickName()); - msg.setOperatorTime(new Date()); - msg.setContent(contents); - log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg)); - factoryDataMessageSender.sendNodeDataByBrand(msg); - } + // if ("我乐".equals(k)) { + // List orderList3 = orderMap.get(k); + // + // List ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.query().lambda() + // .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) + // .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList())) + // ); + // List contents = new ArrayList<>(); + // if (!ladingScanEntities.isEmpty()) { + // Map> listMap = orderList3.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getOrderCode)); + // for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { + // PushData pushData = PushData.builder() + // .packageCode(ladingScanEntity.getPacketBarCode()) + // .orderCode(ladingScanEntity.getOrderSelfNumbering()) + // .warehouseName(warehouse.getName()) + // .waybillNumber(listMap.get(ladingScanEntity.getOrderSelfNumbering()).get(0).getWaybillNumber()).build(); + // contents.add(pushData); + // } + // } + // NodePushMsg msg = new NodePushMsg(); + // msg.setNode(WorkNodeEnums.CLERK_REVIEW); + // msg.setBrand(BrandEnums.OLO); + // msg.setOperator(user.getNickName()); + // msg.setOperatorTime(new Date()); + // msg.setContent(contents); + // log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg)); + // factoryDataMessageSender.sendNodeDataByBrand(msg); + // } + + + // if ("志邦".equals(k)) { + // List orderList3 = orderMap.get(k); + // + // List ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.query().lambda() + // .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) + // .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList())) + // ); + // List contents = new ArrayList<>(); + // if (!ladingScanEntities.isEmpty()) { + // for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { + // JSONObject jsonObject = new JSONObject(); + // jsonObject.put("packageCode", ladingScanEntity.getPacketBarCode()); + // jsonObject.put("orderCode", ladingScanEntity.getOrderSelfNumbering()); + // contents.add(jsonObject); + // } + // } + // NodePushMsg msg = new NodePushMsg(); + // msg.setNode(WorkNodeEnums.CLERK_REVIEW); + // msg.setBrand(BrandEnums.ZB); + // msg.setOperator(user.getNickName()); + // msg.setOperatorTime(new Date()); + // msg.setContent(contents); + // log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg)); + // factoryDataMessageSender.sendNodeDataByBrand(msg); + // } } catch (Exception e) {