From 076b557b4688181bbac5fa38cb4a1e90c852b8fd Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 12 Apr 2024 17:35:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(service):=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E5=BF=97=E9=82=A6=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E9=87=8D=E5=A4=8D=E5=88=99=E4=B8=8D=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=8C=85=E4=BB=B6=E6=95=B0=E6=8D=AE=E5=92=8C=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8C=85=E4=BB=B6=E7=9A=84=E6=9A=82=E5=AD=98?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zbom/mapper/OrderPackageMapper.xml | 4 +- .../zbom/mq/ZbomFactoryOrderListener.java | 37 +++++++++++++++++-- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml index 5af4ea546..07669e4c4 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml @@ -64,7 +64,7 @@ group by re.depart_code, t.platform_order_code diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomFactoryOrderListener.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomFactoryOrderListener.java index 819de6934..2ae6874a7 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomFactoryOrderListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomFactoryOrderListener.java @@ -50,11 +50,14 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * 监听志邦订单数据 @@ -81,7 +84,7 @@ public class ZbomFactoryOrderListener { key = FactoryDataConstants.Mq.RoutingKeys.ZBOM_FACTORY_ORDER )) @Transactional(rollbackFor = Exception.class) - public void factoryOrder(String msg) { + public void factoryOrder(String msg, Set packageCodeSet) { if (StrUtil.isEmpty(msg)) { log.error("消息内容为空"); return; @@ -101,15 +104,34 @@ public class ZbomFactoryOrderListener { log.error("入库单号已推送过了"); return; } + // 查询当前这次推送的数据中的所有包件，校验其是否在数据库中已存在，存在则不保存 + Set packageCode = new HashSet<>(); + List details = zbReceiptDTO.getDetails(); + if (CollUtil.isNotEmpty(details)) { + // 收集包件编码 + List collect = details.stream().map(OrderPackageDTO::getPackageCode).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(collect)) { + List packageCodes = orderPackageService.findByPackageCodes(collect); + if (CollUtil.isNotEmpty(packageCodes)) { + // 将packageCodes中的数据存到packageCode中 + packageCodes.forEach(item -> { + packageCode.add(item.getPackageCode()); + }); + } + } + } ZbReceiptEntity zbReceiptEntity = new ZbReceiptEntity(); BeanUtil.copyProperties(zbReceiptDTO, zbReceiptEntity); // 保存订单数据 receiptService.save(zbReceiptEntity); - List details = zbReceiptDTO.getDetails(); if (CollUtil.isNotEmpty(details)) { List packageEntities = new ArrayList<>(); List packageInfoEntities = new ArrayList<>(); for (OrderPackageDTO detail : details) { + if (packageCode.contains(detail.getPackageCode())) { + log.info(" 接收志邦数据：包条码 {} 已存在数据库中，不保存。", detail.getPackageCode()); + continue; + } ZbOrderPackageEntity packageEntity = new ZbOrderPackageEntity(); BeanUtil.copyProperties(detail, packageEntity); packageEntity.setReceiptId(zbReceiptEntity.getId()); @@ -118,6 +140,9 @@ public class ZbomFactoryOrderListener { // 保存包件数据 orderPackageService.saveBatch(packageEntities); for (OrderPackageDTO detail : details) { + if (packageCode.contains(detail.getPackageCode())) { + continue; + } Long detailId = null; for (ZbOrderPackageEntity packageEntity : packageEntities) { if (ObjectUtil.equal(packageEntity.getPackageCode(), detail.getPackageCode())) { @@ -138,10 +163,10 @@ public class ZbomFactoryOrderListener { packageInfoService.saveBatch(packageInfoEntities); } // 处理暂存单 - buildAdvance(zbReceiptDTO); + buildAdvance(zbReceiptDTO, packageCode); } - private void buildAdvance(ZBReceiptDTO zbReceiptDTO) { + private void buildAdvance(ZBReceiptDTO zbReceiptDTO, Set packageCode) { // 新起线程构建暂存单发送mq ThreadPoolUtil.getThreadPool().submit(() -> { Long startWarehouseId = null; @@ -161,6 +186,10 @@ public class ZbomFactoryOrderListener { List details = zbReceiptDTO.getDetails(); // 入库单号 + 订单自编号 + 发车单号 一个暂存单 for (OrderPackageDTO detail : details) { + if (packageCode.contains(detail.getPackageCode())) { + log.info(" 接收志邦数据：包条码 {} 已存在数据库中，不生成暂存单。", detail.getPackageCode()); + continue; + } String taskCode = zbReceiptDTO.getTaskCode(); String departCode = zbReceiptDTO.getDepartCode(); String platformOrderCode = detail.getPlatformOrderCode();