diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java index 55fa871a9..961db016c 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java @@ -116,12 +116,13 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl abnormalRecordIds = abnormalRecordDTO.getAbnormalRecordIds(); List abnormalRecordEntityList = baseMapper.selectBatchIds(abnormalRecordIds); if(CollUtil.isNotEmpty(abnormalRecordIds)){ - abnormalRecordEntityList.forEach(abnormalRecordEntity -> { + + for (AftersalesAbnormalRecordEntity abnormalRecordEntity : abnormalRecordEntityList) { Long abnormalRecordId = abnormalRecordEntity.getId(); Integer abnormalStatus = abnormalRecordEntity.getAbnormalStatus(); if(abnormalStatus.equals(1)){ log.warn("################dealAbnormal: 异常已完结"); - throw new CustomerException(405,"异常已完结"); + continue; } String abnormalType = abnormalRecordEntity.getAbnormalType(); String upWarehouseName = abnormalRecordEntity.getWarehouseName(); @@ -141,7 +142,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl ldsa.order_status in ('10','20','30','70') and ldsa.reservation_status in ('10','20') @@ -860,7 +858,6 @@ and ldsa.customer_address like concat('%',#{par.customerAddress},'%') - AND lww.check_status = 1 ORDER BY ldsa.warehouse_entry_time DESC 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..b882634c6 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)) { @@ -136,9 +140,9 @@ public class NodeDataPushListener { return; } // 订单 warehouse 不为空为干线，否则为仓配，推送干线的同时回推仓配 - Map orderCodeMap = orderDetailEntities.stream().collect(Collectors.toMap(PushOrderDetailEntity::getOrderId, PushOrderDetailEntity::getCustomItemNo)); + // Map orderCodeMap = orderDetailEntities.stream().collect(Collectors.toMap(PushOrderDetailEntity::getOrderId, PushOrderDetailEntity::getCustomItemNo)); Map detailEntityMap = orderDetailEntities.stream().collect(Collectors.toMap(PushOrderDetailEntity::getCustomItemNo, v -> v)); - List orderIds = orderDetailEntities.stream().map(PushOrderDetailEntity::getOrderId).collect(Collectors.toList()); + // List orderIds = orderDetailEntities.stream().map(PushOrderDetailEntity::getOrderId).collect(Collectors.toList()); // Map pushOrderEntityMap = new HashMap<>(); // if (CollUtil.isNotEmpty(orderIds)) { // List pushOrderEntities = pushOrderService.listByIds(orderIds); @@ -162,8 +166,8 @@ public class NodeDataPushListener { } JSONObject mainJson = JSONUtil.parseObj(main); // 到站 一个订单只发送一次 - for (String orderCode : orderCodes) { - if (pushEntityMap.containsKey(orderCode)) { + // for (String orderCode : orderCodes) { + if (pushEntityMap.containsKey(sendOrderCode)) { continue; } String arriveFor = "carrier"; @@ -171,7 +175,7 @@ public class NodeDataPushListener { if (ObjectUtil.isNotEmpty(pushOrderEntity) && StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) { arriveFor = "stock"; } - PushOrderDetailEntity pushOrderDetailEntity = detailEntityMap.get(orderCode); + PushOrderDetailEntity pushOrderDetailEntity = detailEntityMap.get(sendOrderCode); String boxCodeList = pushOrderDetailEntity.getBoxCodeList(); JSONArray boxCodeListJson = JSONUtil.parseArray(boxCodeList); // JSONArray details = new JSONArray(); @@ -181,9 +185,9 @@ public class NodeDataPushListener { detail.set(item.toString(), 1); // details.add(jsonObject); }); - if (!CollUtil.contains(pushEntityMap.keySet(), orderCode)) { + if (!CollUtil.contains(pushEntityMap.keySet(), sendOrderCode)) { JSONObject js = new JSONObject(); - js.set("extOrderNo", orderCode); + js.set("extOrderNo", sendOrderCode); js.set("extWaybillNO", mainJson.getStr("serviceNumber")); js.set("detail", detail); // js.set("shipNo", mainJson.getStr("waybillNumber")); @@ -214,7 +218,7 @@ public class NodeDataPushListener { log.info("推送工厂结果：{}", result); // 保存推送记录 factoryNodePushService.save(FactoryNodePushEntity.builder() - .orderCode(orderCode) + .orderCode(sendOrderCode) .node(FactoryNodeEnums.FINAL_NET_ARRIVE_CAR.getCode().toString()) .content(JSONUtil.toJsonStr(js)) .resultContent(result) @@ -224,7 +228,7 @@ public class NodeDataPushListener { log.error("推送工厂失败：{}", e); } } - } + // } } else { // 入库一个包件一次 Map pushEntityMap = new HashMap<>(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml index cb82e1b8f..e52d5d9c2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml @@ -175,7 +175,7 @@ select ltco.order_code orderCode, ltco.waybill_no waybillNo, ltco.plan_num planNum, - sum(IF(ltcls.loading_abnormal is null or ltcls.loading_abnormal = '1',0,ltcls.num)) as loadingNum, + sum(IF(ltcls.loading_abnormal is null or ltcls.scan_status = '2',0,ltcls.num)) as loadingNum, lww.check_user_name checkUserName, IFNULL(sum(ltcls.unload_num),0) unloadNum, IFNULL(lww.total_freight/lww.total_count*ltwo.total_number,0) orderFreight, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 11fb287c3..8b07f2394 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -512,11 +512,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl{ + .content(value.stream().map(data->{ return PushData.builder() - .packageCode(data) + .packageCode(data.getPackageCode()) .warehouseName(warehouseEntity.getName()) - .orderCode(brand.getOrderCode()) + .orderCode(data.getOrderCode()) .build(); }).collect(Collectors.toList())) .build();