From d0d59bca1b7b5eff6d285696fde44533fafce019 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 18 Jul 2024 11:05:00 +0800 Subject: [PATCH] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D=202.=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 +- .../trunkline/vo/TrunklineCarsOrderVO.java | 6 + .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/application-dev.yml | 4 +- .../mapper/TrunklineCarsLoadScanMapper.java | 3 + .../mapper/TrunklineCarsLoadScanMapper.xml | 20 ++ .../mapper/TrunklineCarsOrderMapper.java | 4 + .../mapper/TrunklineCarsOrderMapper.xml | 31 ++- .../mapper/TrunklineLoadSignOrderMapper.java | 3 + .../mapper/TrunklineLoadSignOrderMapper.xml | 9 + .../ITrunklineCarsLoadScanService.java | 3 + .../service/ITrunklineCarsOrderService.java | 4 + .../ITrunklineLoadSignOrderService.java | 4 + .../TrunklineCarsLoadScanServiceImpl.java | 10 + .../impl/TrunklineCarsLoadServiceImpl.java | 208 ++++++++++++++++-- .../TrunklineCarsOrderEntityServiceImpl.java | 10 + .../TrunklineLoadSignOrderServiceImpl.java | 14 +- .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/application-dev.yml | 4 +- 20 files changed, 324 insertions(+), 29 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 1bf322b87..149f15f06 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -45,7 +45,7 @@ public interface LauncherConstant { /** * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.3.100:8848"; + String NACOS_DEV_ADDR = "192.168.2.46:8848"; /** @@ -77,7 +77,7 @@ public interface LauncherConstant { /** * seata dev 地址 */ - String SEATA_DEV_ADDR = "192.168.3.100:8091"; + String SEATA_DEV_ADDR = "192.168.2.46:8091"; /** diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsOrderVO.java index edf46b866..5618cc4cf 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsOrderVO.java @@ -5,4 +5,10 @@ import lombok.Data; @Data public class TrunklineCarsOrderVO extends TrunklineCarsOrderEntity { + + private String mallName; + private String mallPerson; + private String mallMobile; + private String mallAddress; + } diff --git a/blade-service/logpm-distribution/src/main/resources/application-dev.yml b/blade-service/logpm-distribution/src/main/resources/application-dev.yml index e2379fc57..5900ebb32 100644 --- a/blade-service/logpm-distribution/src/main/resources/application-dev.yml +++ b/blade-service/logpm-distribution/src/main/resources/application-dev.yml @@ -15,10 +15,10 @@ server: spring: #rabbitmq配置 rabbitmq: - host: 192.168.3.100 + host: 192.168.2.46 port: 5672 username: admin - password: 123456 + password: admin #虚拟host 可以不设置,使用server默认host virtual-host: / #确认消息已发送到队列(Queue) diff --git a/blade-service/logpm-factory/src/main/resources/application-dev.yml b/blade-service/logpm-factory/src/main/resources/application-dev.yml index 3274465f2..a9a180282 100644 --- a/blade-service/logpm-factory/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory/src/main/resources/application-dev.yml @@ -12,10 +12,10 @@ server: spring: #rabbitmq配置 rabbitmq: - host: 192.168.3.100 + host: 192.168.2.46 port: 5672 username: admin - password: 123456 + password: admin #虚拟host 可以不设置,使用server默认host virtual-host: / #确认消息已发送到队列(Queue) diff --git a/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml b/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml index cb3725ec1..f5a8e1df0 100644 --- a/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml +++ b/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml @@ -12,10 +12,10 @@ server: spring: #rabbitmq配置 rabbitmq: - host: 192.168.3.100 + host: 192.168.2.46 port: 5672 username: admin - password: 123456 + password: admin #虚拟host 可以不设置,使用server默认host virtual-host: / #确认消息已发送到队列(Queue) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index 6331971cd..ca8671370 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -162,4 +162,7 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper carsLoadScanIdList); + void clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo); + + void addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(@Param("loadId") Long finalLoadId, @Param("nodeId") Long nodeId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo, @Param("signOrderId") Long signOrderId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index c7476dc14..0fcc72850 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -853,4 +853,24 @@ + + update logpm_trunkline_cars_load_scan + set sign_order_id = null + where load_id = #{loadId} + and warehouse_id = #{nodeId} + and order_code = #{orderCode} + and waybill_no = #{waybillNo} + and scan_status = '1' + + + + update logpm_trunkline_cars_load_scan + set sign_order_id = #{signOrderId} + where load_id = #{loadId} + and warehouse_id = #{nodeId} + and order_code = #{orderCode} + and waybill_no = #{waybillNo} + and scan_status = '1' + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java index 3b98d3905..adc569c08 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java @@ -60,4 +60,8 @@ public interface TrunklineCarsOrderMapper extends BaseMapper findLoadingList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId); Integer findLoadingNumBySignOrderId(@Param("signOrderId") Long signOrderId); + + void updateNoCustomer(@Param("updateCarsOrderIdList") List updateCarsOrderIdList); + + List findMallOrderList(@Param("carsOrderIdList") List carsOrderIdList); } 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 42fe51de2..a6ff9b330 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 @@ -225,11 +225,13 @@ lww.id belongToWarehouseId, lww.name belongToWarehouseName, ltco.final_node_id finalNodeId, - 0 signNum, - '0' signStatus, + case when sum(ltco.sign_num) >= sum(ltco.real_num) and sum(ltco.sign_num) > 0 then '20' + when sum(ltco.sign_num) = 0 then '0' + else '10' end signStatus, GROUP_CONCAT(distinct ldsa.consignee_person) mallPerson, GROUP_CONCAT(distinct ldsa.consignee_mobile) mallMobile, GROUP_CONCAT(distinct ldsa.consignee_address) mallAddress, + sum(ltco.sign_num) signNum, sum(ltco.plan_num) planNum, sum(ltco.real_num) loadingNum from logpm_trunkline_cars_order ltco @@ -322,5 +324,30 @@ where sign_order_id = #{signOrderId} + + update logpm_trunkline_cars_order + set is_customer = '0', + sign_order_id = null + where id in + + #{item} + + and sign_num = 0 + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.java index eb1871b06..51ab86112 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.java @@ -26,4 +26,7 @@ public interface TrunklineLoadSignOrderMapper extends BaseMapper findSignOrderPageList(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); + + void deleteListBySignOrderIds(@Param("delSignOrderList") List delSignOrderList); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml index 3ccab8873..53d2397c6 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml @@ -152,4 +152,13 @@ GROUP BY ltlso.id + + + delete from logpm_trunkline_load_sign_order + where id in + + #{signOrderId} + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java index 4e8712dbe..1b481d0b7 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java @@ -157,4 +157,7 @@ public interface ITrunklineCarsLoadScanService extends BaseService carsLoadScanIdList); + void clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(Long finalLoadId1, Long nodeId, String orderCode, String waybillNo); + + void addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(Long finalLoadId, Long nodeId, String orderCode, String waybillNo, Long signOrderId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java index 51f597206..ed8b92cf9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java @@ -57,4 +57,8 @@ public interface ITrunklineCarsOrderService extends BaseService findLoadingList(Long loadId, Long nodeId); Integer findLoadingNumBySignOrderId(Long signOrderId); + + void updateNoCustomer(List updateCarsOrderIdList); + + List findMallOrderList(List carsOrderIdList); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineLoadSignOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineLoadSignOrderService.java index 320aa150f..4b2133d34 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineLoadSignOrderService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineLoadSignOrderService.java @@ -23,4 +23,8 @@ public interface ITrunklineLoadSignOrderService extends BaseService findSignOrderPageList(IPage page, LoadCarsDTO loadCarsDTO); + + void deleteListBySignOrderIds(List delSignOrderList); + + List findSignOrderListByLoadId(Long loadId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java index d4217e9c1..5cc24d084 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java @@ -378,4 +378,14 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl carsOrderIdList = new ArrayList<>(); @@ -4404,18 +4406,196 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl addCarsOrderEntityList = trunklineCarsOrderService.findMallOrderList(carsOrderIdList); + //把addCarsOrderEntityList中所有元素以mallName和nodeId作为key进行分组 + Map> addCarsOrderEntityMap = addCarsOrderEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsOrderVO -> TrunklineCarsOrderVO.getMallName()+"&&"+TrunklineCarsOrderVO.getNodeId())); + + List signOrderEntityList = trunklineLoadSignOrderService.findAllLoadSignOrderList(loadId, warehouseId); + //把signOrderEntityList中所有元素转化成mallName和warehouseId作为key的map + Map signOrderEntityMap = signOrderEntityList.stream().collect(Collectors.toMap(TrunklineLoadSignOrderEntity -> TrunklineLoadSignOrderEntity.getMallName()+"&&"+TrunklineLoadSignOrderEntity.getWarehouseId(), Function.identity(), (k1, k2) -> k1)); + + List updateCarsOrderList = new ArrayList<>(); + + Long finalLoadId = loadId; + addCarsOrderEntityMap.keySet().forEach(key -> { + String[] split1 = key.split("&&"); + String mallName = split1[0]; + + List trunklineCarsOrderVOS = addCarsOrderEntityMap.get(key); + Long finalNodeId = trunklineCarsOrderVOS.get(0).getFinalNodeId(); + TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity = signOrderEntityMap.get(key); + if(Objects.isNull(trunklineLoadSignOrderEntity)){ + trunklineLoadSignOrderEntity = new TrunklineLoadSignOrderEntity(); + trunklineLoadSignOrderEntity.setLoadId(finalLoadId); + trunklineLoadSignOrderEntity.setWarehouseId(warehouseId); + trunklineLoadSignOrderEntity.setMallName(mallName); + //把trunklineCarsOrderVOS中所有元素的mallPerson去重后用,拼接 + trunklineLoadSignOrderEntity.setMallPerson(trunklineCarsOrderVOS.stream().map(TrunklineCarsOrderVO::getMallPerson).distinct().collect(Collectors.joining(","))); + trunklineLoadSignOrderEntity.setMallMobile(trunklineCarsOrderVOS.stream().map(TrunklineCarsOrderVO::getMallMobile).distinct().collect(Collectors.joining(","))); + trunklineLoadSignOrderEntity.setMallAddress(trunklineCarsOrderVOS.stream().map(TrunklineCarsOrderVO::getMallAddress).distinct().collect(Collectors.joining(","))); + trunklineLoadSignOrderEntity.setBelongToWarehouseId(warehouseId); + trunklineLoadSignOrderEntity.setBelongToWarehouseName(warehouseName); + //把trunklineCarsOrderVOS中所有元素的planNum求和 + trunklineLoadSignOrderEntity.setPlanNum(trunklineCarsOrderVOS.stream().mapToInt(TrunklineCarsOrderVO::getPlanNum).sum()); + trunklineLoadSignOrderEntity.setLoadingNum(trunklineCarsOrderVOS.stream().mapToInt(TrunklineCarsOrderVO::getRealNum).sum()); + trunklineLoadSignOrderEntity.setSignNum(0); + trunklineLoadSignOrderEntity.setSignStatus("0"); + trunklineLoadSignOrderEntity.setLoadSignCode(codeClient.getCodeByType(CodeNumConstant.TRUNKLINE_LOAD_SIGN, warehouseCode, "")); + trunklineLoadSignOrderEntity.setFinalNodeId(finalNodeId); + }else{ + //把trunklineCarsOrderVOS中所有元素的mallPerson去重后放入一个Set + Set mallPersonSet = trunklineCarsOrderVOS.stream() + .map(TrunklineCarsOrderVO::getMallPerson) + .collect(Collectors.toSet()); + mallPersonSet.add(trunklineLoadSignOrderEntity.getMallName()); + trunklineLoadSignOrderEntity.setMallPerson(String.join(",",mallPersonSet)); + Set mallMobileSet = trunklineCarsOrderVOS.stream() + .map(TrunklineCarsOrderVO::getMallMobile) + .collect(Collectors.toSet()); + mallMobileSet.add(trunklineLoadSignOrderEntity.getMallMobile()); + trunklineLoadSignOrderEntity.setMallMobile(String.join(",",mallMobileSet)); + Set mallAddressSet = trunklineCarsOrderVOS.stream() + .map(TrunklineCarsOrderVO::getMallMobile) + .collect(Collectors.toSet()); + mallAddressSet.add(trunklineLoadSignOrderEntity.getMallAddress()); + trunklineLoadSignOrderEntity.setMallAddress(String.join(",",mallAddressSet)); + int plan = trunklineCarsOrderVOS.stream().mapToInt(TrunklineCarsOrderVO::getPlanNum).sum() + trunklineLoadSignOrderEntity.getPlanNum(); + trunklineLoadSignOrderEntity.setPlanNum(plan); + trunklineLoadSignOrderEntity.setLoadingNum(trunklineCarsOrderVOS.stream().mapToInt(TrunklineCarsOrderVO::getRealNum).sum()+trunklineLoadSignOrderEntity.getLoadingNum()); + Integer signNum = trunklineLoadSignOrderEntity.getSignNum(); + if(signNum >= plan){ + trunklineLoadSignOrderEntity.setSignStatus("20"); + }else if(signNum == 0){ + trunklineLoadSignOrderEntity.setSignStatus("0"); + }else{ + trunklineLoadSignOrderEntity.setSignStatus("10"); + } + } + trunklineLoadSignOrderService.saveOrUpdate(trunklineLoadSignOrderEntity); + Long signOrderId = trunklineLoadSignOrderEntity.getId(); + + + + trunklineCarsOrderVOS.forEach(trunklineCarsOrderVO -> { + Long nodeId = trunklineCarsOrderVO.getNodeId(); + String waybillNo = trunklineCarsOrderVO.getWaybillNo(); + String orderCode = trunklineCarsOrderVO.getOrderCode(); + TrunklineCarsOrderEntity updateCarsOrder = new TrunklineCarsOrderEntity(); + updateCarsOrder.setId(trunklineCarsOrderVO.getId()); + updateCarsOrder.setNodeId(nodeId); + updateCarsOrder.setWaybillNo(waybillNo); + updateCarsOrder.setOrderCode(orderCode); + updateCarsOrder.setIsCustomer("1"); + updateCarsOrder.setSignOrderId(signOrderId); + updateCarsOrderList.add(updateCarsOrder); + }); + + }); - //生成直发商家签收单 - createCustomerSignOrder(loadId, warehouseId); + if(CollUtil.isNotEmpty(updateCarsOrderList)){ + trunklineCarsOrderService.updateBatchById(updateCarsOrderList); + updateCarsOrderList.forEach(e -> { + Long nodeId = e.getNodeId(); + String orderCode = e.getOrderCode(); + String waybillNo = e.getWaybillNo(); + Long signOrderId = e.getSignOrderId(); + trunklineCarsLoadScanService.addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(finalLoadId, nodeId, orderCode, waybillNo, signOrderId); + }); + } + + }else{ + //直发商家移除 + List dealwithCarsOrderIdList = new ArrayList<>(); + List carsOrderEntityList = trunklineCarsOrderService.listByIds(carsOrderIdList); + //移除carsOrderEntityList中signNum不为0的元素 + carsOrderEntityList.removeIf(e -> e.getSignNum() != 0); + //把carsOrderEntityList通过signOrderId进行分组 + Map> collect = carsOrderEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsOrderEntity::getSignOrderId)); + Set signOrderIds = collect.keySet(); + List signOrderEntityList = trunklineLoadSignOrderService.listByIds(signOrderIds); + //把signOrderEntityList转化成id为key的Map + Map signOrderEntityMap = signOrderEntityList.stream().collect(Collectors.toMap(TrunklineLoadSignOrderEntity::getId, Function.identity())); + + + List updateCarsOrderList = new ArrayList<>(); + List updateSignOrderList = new ArrayList<>(); + List delSignOrderList = new ArrayList<>(); + + Long finalLoadId1 = loadId; + collect.keySet().forEach(signOrderId -> { + List list = collect.get(signOrderId); + TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity = signOrderEntityMap.get(signOrderId); + //把list中所有元素的realNum求和 + int sum = list.stream().mapToInt(TrunklineCarsOrderEntity::getRealNum).sum(); + Integer planNum = trunklineLoadSignOrderEntity.getPlanNum(); + Integer signNum = trunklineLoadSignOrderEntity.getSignNum(); + if(sum < planNum){ + //只是更新不删除 + TrunklineLoadSignOrderEntity updateSignOrderEntity = new TrunklineLoadSignOrderEntity(); + updateSignOrderEntity.setId(trunklineLoadSignOrderEntity.getId()); + int diff = planNum - sum; + updateSignOrderEntity.setPlanNum(diff); + if(signNum >= diff){ + updateSignOrderEntity.setSignStatus("20"); + }else if(signNum == 0){ + updateSignOrderEntity.setSignStatus("0"); + }else{ + updateSignOrderEntity.setSignStatus("10"); + } + updateSignOrderList.add(updateSignOrderEntity); + }else{ + //删除 + delSignOrderList.add(signOrderId); + } + + list.forEach(e -> { + TrunklineCarsOrderEntity carsOrderEntity = new TrunklineCarsOrderEntity(); + carsOrderEntity.setOrderCode(e.getOrderCode()); + carsOrderEntity.setWaybillNo(e.getWaybillNo()); + carsOrderEntity.setLoadId(finalLoadId1); + carsOrderEntity.setNodeId(e.getNodeId()); + updateCarsOrderList.add(carsOrderEntity); + }); + + }); + + if(CollUtil.isNotEmpty(updateSignOrderList)){ + trunklineLoadSignOrderService.updateBatchById(updateSignOrderList); + } + if(CollUtil.isNotEmpty(delSignOrderList)){ + trunklineLoadSignOrderService.deleteListBySignOrderIds(delSignOrderList); + } + if(CollUtil.isNotEmpty(updateCarsOrderList)){ + //把updateCarsOrderIdList所有的id放入一个List + List updateCarsOrderIdList = updateCarsOrderList.stream().map(TrunklineCarsOrderEntity::getId).collect(Collectors.toList()); + trunklineCarsOrderService.updateNoCustomer(updateCarsOrderIdList); + updateCarsOrderList.forEach(e -> { + Long nodeId = e.getNodeId(); + String orderCode = e.getOrderCode(); + String waybillNo = e.getWaybillNo(); + trunklineCarsLoadScanService.clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(finalLoadId1,nodeId,orderCode,waybillNo); + }); + } + } + + List signOrderList =trunklineLoadSignOrderService.findSignOrderListByLoadId(loadId); + String isCustomer1 = carsLoadEntity.getIsCustomer(); + if(CollUtil.isNotEmpty(signOrderList)){ + if("2".equals(isCustomer1)){ + carsLoadEntity.setIsCustomer("1"); + updateById(carsLoadEntity); + } + }else{ + if("1".equals(isCustomer1)){ + carsLoadEntity.setIsCustomer("2"); + updateById(carsLoadEntity); + } + } return R.success("更新成功"); } @@ -4776,12 +4956,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl= loadingNum) { signOrderEntity.setSignStatus("20"); signOrderEntity.setSignTime(new Date()); } else { @@ -4919,7 +5099,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadIds = new HashSet<>(); //把list通过signOrderId进行分组 - Map> map = list.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getSignOrderId)); + Map> map = list.stream().filter(e -> !Objects.isNull(e.getSignOrderId())).collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getSignOrderId)); map.keySet().forEach(e -> { List trunklineCarsLoadScanVOS = map.get(e);//该签收单对应的包件 trunklineCarsLoadScanVOS.forEach(t -> { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java index 6a3db5225..90bc97912 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java @@ -138,4 +138,14 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl updateCarsOrderIdList) { + baseMapper.updateNoCustomer(updateCarsOrderIdList); + } + + @Override + public List findMallOrderList(List carsOrderIdList) { + return baseMapper.findMallOrderList(carsOrderIdList); + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineLoadSignOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineLoadSignOrderServiceImpl.java index 259b5b1ea..bd87d6ea2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineLoadSignOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineLoadSignOrderServiceImpl.java @@ -1,9 +1,9 @@ package com.logpm.trunkline.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.LoadCarsDTO; import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; -import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity; import com.logpm.trunkline.mapper.TrunklineLoadSignOrderMapper; import com.logpm.trunkline.service.ITrunklineLoadSignOrderService; import com.logpm.trunkline.vo.SignOrderDetailVO; @@ -54,4 +54,16 @@ public class TrunklineLoadSignOrderServiceImpl extends BaseServiceImpl findSignOrderPageList(IPage page, LoadCarsDTO loadCarsDTO) { return baseMapper.findSignOrderPageList(page,loadCarsDTO); } + + @Override + public void deleteListBySignOrderIds(List delSignOrderList) { + baseMapper.deleteListBySignOrderIds(delSignOrderList); + } + + @Override + public List findSignOrderListByLoadId(Long loadId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("load_id",loadId); + return baseMapper.selectList(queryWrapper); + } } diff --git a/blade-service/logpm-trunkline/src/main/resources/application-dev.yml b/blade-service/logpm-trunkline/src/main/resources/application-dev.yml index 232ee8954..b017fcbd3 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-dev.yml +++ b/blade-service/logpm-trunkline/src/main/resources/application-dev.yml @@ -12,10 +12,10 @@ server: spring: #rabbitmq配置 rabbitmq: - host: 192.168.3.100 + host: 192.168.2.46 port: 5672 username: admin - password: 123456 + password: admin #虚拟host 可以不设置,使用server默认host virtual-host: / #确认消息已发送到队列(Queue) diff --git a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml index 3c5425ca3..b7affbaba 100644 --- a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml +++ b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml @@ -12,10 +12,10 @@ server: spring: #rabbitmq配置 rabbitmq: - host: 192.168.3.100 + host: 192.168.2.46 port: 5672 username: admin - password: 123456 + password: admin #虚拟host 可以不设置,使用server默认host virtual-host: / #确认消息已发送到队列(Queue)