diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtPushDataDTO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtPushDataDTO.java index 994324f3a..1b8883bbf 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtPushDataDTO.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtPushDataDTO.java @@ -9,8 +9,10 @@ public class MtPushDataDTO implements Serializable { /** 发货单编号 */ private String senderCode; - /** 发货单编号 */ + /** 订单编号 */ private String orderCode; + /** 包件码 */ + private String packageCode; /** 工厂出库方式 */ private String outWarehouseType; /** 经销商名称 */ diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java index 5f8f14ff8..32ed3cf30 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java @@ -96,15 +96,15 @@ public class NodeDataPushListener { // 2 获取业务数据 List content = entries.getBeanList("content", PushData.class); FactoryNodeEnums factoryByNodeAndStatus = NodeMappingEnums.getFactoryByNodeAndStatus(workNodeEnums); - List mtPushDataDTOS = mtFactoryDataClient.orderPushData(content.stream().map(m -> m.getOrderCode()).collect(Collectors.toSet())); + List mtPushDataDTOS = mtFactoryDataClient.orderPushData(content.stream().map(m -> m.getPackageCode()).collect(Collectors.toSet())); // 收货 if (factoryByNodeAndStatus.equals(FactoryNodeEnums.CENTRAL_STK_IN)) { if (CollUtil.isNotEmpty(mtPushDataDTOS)) { // 转map - Map mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO)); + Map mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getPackageCode, mtPushDataDTO -> mtPushDataDTO)); String finalInWarehouseType = inWarehouseType; List collect = content.stream().map(pushData -> { - MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getOrderCode()); + MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getPackageCode()); if (ObjectUtil.isNotEmpty(mtPushDataDTO)) { return CentralStkInVO.builder() .dealerName(mtPushDataDTO.getDealerName()) @@ -151,13 +151,14 @@ public class NodeDataPushListener { for (Map.Entry> stringListEntry : collect.entrySet()) { String senderCode = stringListEntry.getKey(); List mtPushDataDTOS1 = stringListEntry.getValue(); + Map mtPushDataDTOMap = mtPushDataDTOS1.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO)); CentralStkInConfirmVO confirmVO = CentralStkInConfirmVO.builder() .senderCode(senderCode) .operatingTime(operatorTime) .operatingWarehouseName(warehouse) .inWarehouseType(inWarehouseType) .orderVOS( - mtPushDataDTOS1.stream().map(mtPushDataDTO -> { + mtPushDataDTOMap.values().stream().map(mtPushDataDTO -> { return CentralStkInConfirmOrderVO.builder() .orderCode(mtPushDataDTO.getOrderCode()) .outWarehouseType(mtPushDataDTO.getOutWarehouseType()) @@ -202,12 +203,12 @@ public class NodeDataPushListener { } // 签收扫描 if (factoryByNodeAndStatus.equals(FactoryNodeEnums.SIGN_FOR)) { - Map mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO)); + Map mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getPackageCode, mtPushDataDTO -> mtPushDataDTO)); // 表单数据 String main = entries.getStr("main"); JSONObject entries1 = JSONUtil.parseObj(main); List signForVOS = content.stream().map(pushData -> { - MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getOrderCode()); + MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getPackageCode()); if (ObjectUtil.isNotEmpty(mtPushDataDTO)) { return SignForVO.builder() .sendTaskId(entries1.getStr("boId")) @@ -263,7 +264,7 @@ public class NodeDataPushListener { .map(m -> { return SignForConfirmImageVO.builder().image(m.toString()).build(); }).collect(Collectors.toList()); - Map mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO)); + Map mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getPackageCode, mtPushDataDTO -> mtPushDataDTO)); SignForConfirmVO confirmVO = SignForConfirmVO.builder() .sendTaskId(entries1.getStr("boId")) .consignee(entries1.getStr("consignee")) @@ -272,12 +273,12 @@ public class NodeDataPushListener { pushData -> { return SignForConfirmPackageVO.builder() .orderCode(pushData.getOrderCode()) - .outWarehouseType(mtPushDataDTOMap.get(pushData.getOrderCode()).getOutWarehouseType()) + .outWarehouseType(mtPushDataDTOMap.get(pushData.getPackageCode()).getOutWarehouseType()) .packageCode(pushData.getPackageCode()) .operatingTime(operatorTime) - .warehouseCode(mtPushDataDTOMap.get(pushData.getOrderCode()).getWarehouseCode()) + .warehouseCode(mtPushDataDTOMap.get(pushData.getPackageCode()).getWarehouseCode()) .operatingWarehouseName(warehouse) - .senderCode(mtPushDataDTOMap.get(pushData.getOrderCode()).getSenderCode()) + .senderCode(mtPushDataDTOMap.get(pushData.getPackageCode()).getSenderCode()) .build(); } ).collect(Collectors.toList())) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml index 1cec56457..402b6c3fe 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml @@ -102,14 +102,15 @@