From e90383f12ce0d57256dfd8043550a6262ac5a392 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 29 Aug 2024 09:38:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=89=E6=96=B9=E4=B8=AD=E8=BD=AC=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/vo/TrunklineCarsLoadScanVO.java | 1 + .../TripartiteTransferController.java | 61 ++++- .../mapper/TrunklineCarsLoadScanMapper.java | 4 + .../mapper/TrunklineCarsLoadScanMapper.xml | 20 +- .../service/IOpenOrderAsyncService.java | 2 + .../ITrunklineCarsLoadScanService.java | 4 + .../service/ITrunklineCarsLoadService.java | 2 + .../impl/OpenOrderAsyncServiceImpl.java | 75 ++++++ .../TrunklineCarsLoadScanServiceImpl.java | 10 + .../impl/TrunklineCarsLoadServiceImpl.java | 231 ++++++++++++++---- .../TrunklineWaybillTrackServiceImpl.java | 18 +- 11 files changed, 371 insertions(+), 57 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadScanVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadScanVO.java index a9bee5e6d..70ef81332 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadScanVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadScanVO.java @@ -7,6 +7,7 @@ import lombok.Data; public class TrunklineCarsLoadScanVO extends TrunklineCarsLoadScanEntity { private Long signOrderId; + private Long carsLoadScanId; private String destinationWarehouseName; diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java index e3a5d7ea8..af225e61c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java @@ -175,6 +175,38 @@ public class TripartiteTransferController { } + @ResponseBody + @PostMapping("/startCarsBefore") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "三方中转发车前验证", notes = "传入loadCarsDTO") + public R startCarsBefore(@RequestBody LoadCarsDTO loadCarsDTO) { + String method = "############startCars: "; + log.info(method+"请求参数{}",loadCarsDTO); + Long loadId = loadCarsDTO.getLoadId(); + try{ + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(400,"多仓权限无法操作，请选择仓库"); + } + if(Objects.isNull(loadId)){ + log.warn(method+"三方中转id为空 loadId={}",loadId); + return R.fail(400,"三方中转id为空"); + } + + + return carsLoadService.startCarsBefore(loadId,myCurrentWarehouse.getId()); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + @ResponseBody @PostMapping("/startCars") @ApiOperationSupport(order = 1) @@ -392,6 +424,7 @@ public class TripartiteTransferController { String carNumber = carsLoadDTO.getCarNumber(); String remark = carsLoadDTO.getRemark(); String loadType = carsLoadDTO.getLoadType(); + String deliveryType = carsLoadDTO.getDeliveryType(); try{ @@ -406,18 +439,26 @@ public class TripartiteTransferController { log.warn(method+"配载id为空 loadId={}",loadId); return R.fail(400,"配载id为空"); } - if(Objects.isNull(driverId)){ - log.warn(method+"司机id为空 driverId={}",driverId); - return R.fail(400,"司机id为空"); - } - if(StringUtil.isBlank(driverName)){ - log.warn(method+"司机名称为空 driverName={}",driverName); - return R.fail(400,"司机名称为空"); + if(StringUtil.isBlank(deliveryType)){ + log.warn(method+"送货方式为空 deliveryType={}",deliveryType); + return R.fail(400,"送货方式为空"); } - if(StringUtil.isBlank(driverMobile)){ - log.warn(method+"司机电话为空 driverMobile={}",driverMobile); - return R.fail(400,"司机电话为空"); + + if(deliveryType.equals("2")){ + if(Objects.isNull(driverId)){ + log.warn(method+"司机id为空 driverId={}",driverId); + return R.fail(400,"司机id为空"); + } + + if(StringUtil.isBlank(driverName)){ + log.warn(method+"司机名称为空 driverName={}",driverName); + return R.fail(400,"司机名称为空"); + } + if(StringUtil.isBlank(driverMobile)){ + log.warn(method+"司机电话为空 driverMobile={}",driverMobile); + return R.fail(400,"司机电话为空"); + } } if(StringUtil.isBlank(chargeType)){ 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 98db9c039..7557ffb12 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 @@ -171,4 +171,8 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findAbnormalZeroScanList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); List findZeroStartNum(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + List findAllIdListByLoadIdAndNoScanStatus(@Param("loadId") Long loadId, @Param("scanStatus") String scanStatus); + + List findTransferLoadScanWaybillList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId); } 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 a8bf03373..9b8e2f006 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 @@ -80,7 +80,8 @@ + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java index d75fcf07d..a7646fa31 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java @@ -10,10 +10,12 @@ public interface IOpenOrderAsyncService { void saveLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName,Long userId,Long warehouseId,String warehouseName); void saveStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId); + void saveTripartiteStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId); void saveCancelStartCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId); void saveArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId); + void saveTripartiteArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId); void saveCancelArriveCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId); 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 51913e4ef..84a0a0cdd 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 @@ -166,4 +166,8 @@ public interface ITrunklineCarsLoadScanService extends BaseService findAbnormalZeroScanList(Long loadId, Long warehouseId); List findZeroStartNum(Long loadId, Long warehouseId); + + List findAllIdListByLoadIdAndNoScanStatus(Long loadId, String scanStatus); + + List findTransferLoadScanWaybillList(Long loadId, Long nodeId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 183fcd320..0c29aa26a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -223,4 +223,6 @@ public interface ITrunklineCarsLoadService extends BaseService list = trunklineCarsLoadScanService.findTransferLoadScanWaybillList(loadId,nodeId); + + for (LoadScanWaybillVO loadScanWaybillVO : list) { + String waybillNo = loadScanWaybillVO.getWaybillNo(); + Integer num = loadScanWaybillVO.getNum(); + WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); + if(Objects.isNull(waybillEntity)){ + log.warn("##############saveStartCarLog: 运单信息不存在 waybillNo={}",waybillNo); + continue; + } + Long waybillId = waybillEntity.getId(); + + String operationRemark = "运单装车"+num+"件 三方中转批次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+"，司机手机："+driverMobile; + saveLog(waybillId,waybillNo,"30",nodeName+" 三方中转装车",operationRemark,nickName,userId,nodeId,nodeName); + + operationRemark = "三方中转从"+nodeName+"发车，实际发车时间"+ CommonUtil.dateToStringGeneral(new Date()); + saveLog(waybillId,waybillNo,"40",nodeName+"已发车",operationRemark,nickName,userId,nodeId,nodeName); + } + + } + + private void saveTrackLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName,Long userId,Long warehouseId,String warehouseName) { TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity(); waybillTrackEntity.setWarehouseId(warehouseId); @@ -249,6 +294,36 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService { } } + @LogpmAsync("asyncExecutor") + @Override + public void saveTripartiteArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId) { + Long loadId = carsLoadLineEntity.getLoadId(); + TrunklineCarsLoadEntity carsLoadEntity = trunklineCarsLoadService.getById(loadId); + if(Objects.isNull(carsLoadEntity)){ + log.warn("##############saveCancelStartCarLog: 配载信息不存在 loadId={}",loadId); + return; + } + + Long nodeId = carsLoadLineEntity.getNodeId(); + String nodeName = carsLoadLineEntity.getNodeName(); + + + List list = trunklineCarsLoadScanService.findArriveLoadScanWaybillList(loadId,nodeId); + + for (LoadScanWaybillVO loadScanWaybillVO : list) { + String waybillNo = loadScanWaybillVO.getWaybillNo(); + WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); + if(Objects.isNull(waybillEntity)){ + log.warn("##############saveCancelStartCarLog: 运单信息不存在 waybillNo={}",waybillNo); + continue; + } + Long waybillId = waybillEntity.getId(); + + String operationRemark = "三方中转到达"+nodeName+"，到达时间"+ CommonUtil.dateToStringGeneral(new Date()); + saveLog(waybillId,waybillNo,"60",nodeName+" 三方中转到达",operationRemark,nickName,userId,nodeId,nodeName); + } + } + @LogpmAsync("asyncExecutor") @Override public void saveCancelArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId) { 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 211f387a6..2e7e8f3c4 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 @@ -404,4 +404,14 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl findAllIdListByLoadIdAndNoScanStatus(Long loadId, String scanStatus) { + return baseMapper.findAllIdListByLoadIdAndNoScanStatus(loadId,scanStatus); + } + + @Override + public List findTransferLoadScanWaybillList(Long loadId, Long nodeId) { + return baseMapper.findTransferLoadScanWaybillList(loadId,nodeId); + } + } 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 2134603a2..d4816a506 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 @@ -1719,6 +1719,22 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("load_id",loadId); + + List carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper); + Integer loadingNum = carsLoadScanEntityList.stream().mapToInt(t -> Objects.nonNull(t.getNum()) ? t.getNum() : 0).sum(); + Integer unloadNum = carsLoadScanEntityList.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum(); + + Map map = new HashMap<>(); + map.put("loadingNum",loadingNum); + map.put("unloadNum",unloadNum); + + return R.data(map); + } + @Transactional(rollbackFor = Exception.class) @Override @@ -2355,10 +2371,65 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId); + openOrderAsyncService.saveTripartiteStartCarLog(carsLoadLineEntity, AuthUtil.getNickName(), AuthUtil.getUserId()); - String content = "包件在 " + warehouseEntity.getName() + "三方中转发车"; - packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.TRIPARTITE_TRANSFER_DEPART.getCode(), content); + List orderPackageCodes = new ArrayList<>(); + List noUnloadOrderPackageCodes = new ArrayList<>(); + + //处理三方中转未卸车数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("load_id",loadId); + List carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper); + //把carsLoadScanEntityList中所有元素通过type进行分组 + //通过type分组区分零担和包件 + Map> carsLoadScanEntityMap = carsLoadScanEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getType)); + carsLoadScanEntityMap.keySet().forEach(type -> { + List trunklineCarsLoadScanEntities = carsLoadScanEntityMap.get(type); + if(type == 1){ + //包件 + trunklineCarsLoadScanEntities.forEach(trunklineCarsLoadScanEntity -> { + String scanCode = trunklineCarsLoadScanEntity.getScanCode(); + Integer num = trunklineCarsLoadScanEntity.getNum(); + Integer unloadNum = trunklineCarsLoadScanEntity.getUnloadNum(); + Integer isData = trunklineCarsLoadScanEntity.getIsData(); + if(unloadNum == num){ + orderPackageCodes.add(scanCode); + }else{ + //未卸车包件 + if(isData == 1){ + noUnloadOrderPackageCodes.add(scanCode); + } + } + }); + }else if(type == 2){ + //零担 + //把trunklineCarsLoadScanEntities通过orderCode进行分组 + //通过orderCode分组 + Map> orderCodeMap = trunklineCarsLoadScanEntities.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getOrderCode)); + orderCodeMap.keySet().forEach(orderCode -> { + List trunklineCarsLoadScanEntities1 = orderCodeMap.get(orderCode); + Integer loadingNum = trunklineCarsLoadScanEntities1.stream().mapToInt(t -> Objects.nonNull(t.getNum()) ? t.getNum() : 0).sum(); + Integer unloadNum = trunklineCarsLoadScanEntities1.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum(); + int i = loadingNum - unloadNum; + + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, warehouseId); + if(!Objects.isNull(stockArticleEntity)){ + distributionStockArticleClient.addHandQuantity(stockArticleEntity.getId(), i); + } + }); + } + }); + + + if(CollUtil.isNotEmpty(orderPackageCodes)){ + String content = "包件在 " + warehouseEntity.getName() + "三方中转发车"; + packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.TRIPARTITE_TRANSFER_DEPART.getCode(), content); + } + + if(CollUtil.isNotEmpty(noUnloadOrderPackageCodes)){ + String content = "包件在 " + warehouseEntity.getName() + "三方中转取消装车"; + packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), noUnloadOrderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content); + } } catch (Exception e) { log.warn("#############startCarByLoadId: 存入日志失败"); @@ -2493,6 +2564,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId); + openOrderAsyncService.saveTripartiteArriveCarLog(carsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId()); + String content = "包件在 " + warehouseEntity.getName() + "三方中转到达"; packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.ARRICE_TRIPARTITE_TRANSFER_DEPART.getCode(), content); @@ -2535,27 +2608,30 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndNoScanStatus(loadId,"3"); - try { - trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.TRIPARTITE_TRANSFER_SIGN.getValue()); + return signLoadScanByIds(scanLoadIds,warehouseId); - List orderPackageCodes = trunklineCarsLoadScanService.findSignListOrderPackageCodes(loadId); - - String content = "包件在" + warehouseEntity.getName() + "被三方中转整车签收"; - packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode(), content); - // 推送签收数据给工厂 - sendFactorySignTriparite(warehouseId, orderPackageCodes, warehouseEntity); - } catch (Exception e) { - log.warn("###########存入日志失败"); - } - - - return R.success("签收成功"); +// carsLoadEntity.setSignTime(new Date()); +// carsLoadEntity.setLoadStatus("90"); +// updateById(carsLoadEntity); +// +// trunklineCarsLoadScanService.updateScanStatusByLoadId(loadId, "3", new Date(),AuthUtil.getNickName()); +// +// try { +// trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.TRIPARTITE_TRANSFER_SIGN.getValue()); +// +// List orderPackageCodes = trunklineCarsLoadScanService.findSignListOrderPackageCodes(loadId); +// +// String content = "包件在" + warehouseEntity.getName() + "被三方中转整车签收"; +// packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode(), content); +// // 推送签收数据给工厂 +// sendFactorySignTriparite(warehouseId, orderPackageCodes, warehouseEntity); +// } catch (Exception e) { +// log.warn("###########存入日志失败"); +// } +// return R.success("签收成功"); } @Override @@ -3647,6 +3723,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); try { +// if(!Objects.isNull(waybillId)){ +// WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); +// waybillPackageService.updateWaybillStatus(waybillEntity); +// WaybillLogDTO waybillLogDTO = new WaybillLogDTO(); +// waybillLogDTO.setWarehouseId(warehouseId); +// waybillLogDTO.setWarehouseName(warehouseName); +// waybillLogDTO.setWaybillNo(waybillEntity.getWaybillNo()); +// waybillLogDTO.setTrainNumber(carsLoadEntity.getCarsNo()); +// waybillLogDTO.setCarNumber(carsLoadEntity.getCarNumber()); +// waybillLogDTO.setSignUser(AuthUtil.getNickName()); +// waybillLogDTO.setSignTime(date); +// waybillLogDTO.setDriverName(carsLoadEntity.getDriverName()); +// waybillLogDTO.setNum(unloadNum); +// waybillLogDTO.setSignOrderCode(carsLoadEntity.getCarsNo()); +// waybillLogDTO.setType(1); +// waybillLogDTO.setUserId(AuthUtil.getUserId()); +// waybillLogDTO.setNickName(AuthUtil.getNickName()); +// waybillTrackService.addSignWaybillLog(waybillLogDTO); +// } + orderPackageCodes.add(orderPackageCode); String content = "包件在 " + warehouseEntity.getName() + "直发商家签收"; packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.SIGN_DIRECT_SHIPPER.getCode(), content); @@ -5474,8 +5598,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl> map = trunklineCarsLoadScanEntities.stream().filter(t -> Objects.nonNull(t.getWaybillNo())).collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getWaybillNo)); map.keySet().forEach(waybillNo -> { List list = map.get(waybillNo); - //把list中所有元素的unloadNum求和，没有值就取0 - Integer unloadNum = list.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum(); - - WaybillLogDTO waybillLogDTO = new WaybillLogDTO(); - waybillLogDTO.setWarehouseId(warehouseId); - waybillLogDTO.setWarehouseName(warehouseName); - waybillLogDTO.setWaybillNo(waybillNo); - waybillLogDTO.setTrainNumber(carsLoadEntity.getCarsNo()); - waybillLogDTO.setCarNumber(carsLoadEntity.getCarNumber()); - waybillLogDTO.setSignUser(AuthUtil.getNickName()); - waybillLogDTO.setSignTime(date); - waybillLogDTO.setDriverName(carsLoadEntity.getDriverName()); - waybillLogDTO.setNum(unloadNum); - waybillLogDTO.setSignOrderCode(carsLoadEntity.getCarsNo()); - waybillLogDTO.setType(1); - waybillLogDTO.setUserId(AuthUtil.getUserId()); - waybillLogDTO.setNickName(AuthUtil.getNickName()); - waybillTrackService.addSignWaybillLog(waybillLogDTO); - }); + Integer signNum = 0; + if("1".equals(deliveryType)){ + signNum = list.stream().mapToInt(t -> Objects.nonNull(t.getNum()) ? t.getNum() : 0).sum(); + }else if("2".equals(deliveryType)){ + signNum = list.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum(); + } + if(signNum > 0){ + WaybillLogDTO waybillLogDTO = new WaybillLogDTO(); + waybillLogDTO.setWarehouseId(warehouseId); + waybillLogDTO.setWarehouseName(warehouseName); + waybillLogDTO.setWaybillNo(waybillNo); + waybillLogDTO.setTrainNumber(carsLoadEntity.getCarsNo()); + waybillLogDTO.setCarNumber(carsLoadEntity.getCarNumber()); + waybillLogDTO.setSignUser(AuthUtil.getNickName()); + waybillLogDTO.setSignTime(date); + waybillLogDTO.setDriverName(carsLoadEntity.getDriverName()); + waybillLogDTO.setNum(signNum); + waybillLogDTO.setSignOrderCode(carsLoadEntity.getCarsNo()); + waybillLogDTO.setType(1); + waybillLogDTO.setUserId(AuthUtil.getUserId()); + waybillLogDTO.setNickName(AuthUtil.getNickName()); + waybillTrackService.addSignWaybillLog(waybillLogDTO); + } + + }); } catch (Exception e) { log.warn("###########存入日志失败"); @@ -6395,7 +6538,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl waybillLogDTOList = new ArrayList<>(); QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.eq("load_id",warehouseId) + queryWrapper1.eq("load_id",loadId) .eq("sign_order_id",signOrderId) .eq("scan_status","3"); List signCarsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper1); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java index a7144c1a5..0aeb85233 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java @@ -100,6 +100,9 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl