From b45cc116b7c41ef4d3c6abc789e768f35941c1f8 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Sat, 26 Oct 2024 19:29:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=87=91?= =?UTF-8?q?=E7=89=8C=E5=9B=9E=E6=8E=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 增加末端仓卸车扫描回推工厂逻辑 --- .../com/logpm/factorydata/jinpai/enums/FactoryNodeEnums.java | 2 +- .../com/logpm/factorydata/jinpai/enums/NodeMappingEnums.java | 1 + .../com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java | 1 + .../com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java | 4 ++++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/FactoryNodeEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/FactoryNodeEnums.java index 8567c7f34..cecd2b86f 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/FactoryNodeEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/FactoryNodeEnums.java @@ -21,7 +21,7 @@ public enum FactoryNodeEnums { /** * 包件入库 */ - END_WAREHOUSE_UNLOADING(105010,"包件入库", 1) + END_WAREHOUSE_UNLOADING(105010,"包件入库", 1), ; private Integer code; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeMappingEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeMappingEnums.java index 94ee47af4..2390623a1 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeMappingEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeMappingEnums.java @@ -21,6 +21,7 @@ public enum NodeMappingEnums { * 包件入库 */ END_WAREHOUSE_UNLOADING(FactoryNodeEnums.END_WAREHOUSE_UNLOADING, WorkNodeEnums.END_WAREHOUSE_UNLOADING, 1), + UNLOAD_INCOMING_WAREHOUSE(FactoryNodeEnums.END_WAREHOUSE_UNLOADING, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE, 1), ; /** diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java index 624a144b4..9d8459e6f 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java @@ -21,6 +21,7 @@ public enum NodeNeedEnums implements Serializable { * 包件入库 */ END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"), + UNLOAD_INCOMING_WAREHOUSE(105010, "末端仓卸车确认"), ; private Integer code; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java index bc5559fbb..c6c3434e5 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java @@ -93,6 +93,10 @@ public class NodeDataPushListener { // 3 拿到所有必推节点的code List mustPushCode = FactoryNodeEnums.getMustPushCode(); if (CollUtil.isNotEmpty(content)) { + // 卸车扫描节点 判断是否是末端仓卸车，末端仓卸车推送的数据推送 + if (NodeNeedEnums.UNLOAD_INCOMING_WAREHOUSE.getCode().equals(workNodeEnums.getCode())) { + content = content.stream().filter(item -> ObjectUtil.equal(item.getWarehouseName(), item.getDestinationWarehouse())).collect(Collectors.toList()); + } // 查询出本次操作的所有订单 Set orderCodes = content.stream().map(PushData::getOrderCode).collect(Collectors.toSet()); if (CollUtil.isEmpty(orderCodes)) {