Browse Source

feat(all): 修改金牌回推逻辑

1 增加末端仓卸车扫描回推工厂逻辑
visual
zhaoqiaobo 3 months ago
parent
commit
b45cc116b7
  1. 2
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/FactoryNodeEnums.java
  2. 1
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeMappingEnums.java
  3. 1
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java
  4. 4
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java

2
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;

1
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),
;
/**

1
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;

4
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<Integer> 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<String> orderCodes = content.stream().map(PushData::getOrderCode).collect(Collectors.toSet());
if (CollUtil.isEmpty(orderCodes)) {

Loading…
Cancel
Save