diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index ae04ee967..6de7491c0 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -1222,116 +1222,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl aftersalesWorkOrderEntities = baseMapper.selectList(Wrappers.query().lambda() - .eq(AftersalesWorkOrderEntity::getIsDeleted,0) - .apply("work_order_status in (10,20)") - ); - if(!aftersalesWorkOrderEntities.isEmpty()){ - List workOrderVOList = new ArrayList<>(); - for (AftersalesWorkOrderEntity i : aftersalesWorkOrderEntities) { - // 获取当前时间 - LocalDateTime now = LocalDateTime.now(); - // 获取48小时前的时间 - LocalDateTime before48Hours = now.minusHours(48); - // 获取48小时前的时间戳（秒数） - long timestamp = before48Hours.toEpochSecond(ZoneOffset.ofHours(8)); - long l = i.getCreateTime().getTime() / 1000; - long l1 = timestamp - l; - if (l1 > 0) { - //查询处理方是否处理 - List list = aftersalesProcessorService.list(Wrappers.query().lambda() - .eq(AftersalesProcessorEntity::getWorkOrderId, i.getId()) - .eq(AftersalesProcessorEntity::getTypesOf, "2") - .eq(AftersalesProcessorEntity::getProcessingStatus, "1") - ); - if(list.isEmpty()){ - continue; - } - list.forEach( a ->{ - AftersalesWorkOrderVO aftersalesWorkOrderVO = new AftersalesWorkOrderVO(); - BeanUtil.copyProperties(i,aftersalesWorkOrderVO); - //以超时 - aftersalesWorkOrderVO.setBusinessName(a.getBusinessName()); - aftersalesWorkOrderVO.setBusinessId(a.getBusinessId()); - aftersalesWorkOrderVO.setProcessorId(a.getId()); - workOrderVOList.add(aftersalesWorkOrderVO); - }); - - } else { - continue; - } - } - - if(!workOrderVOList.isEmpty()){ - workOrderVOList.forEach(i ->{ - - // 假设有两个时间戳（秒数） - long timestamp1 = new Date().getTime() / 1000; // 现在时间 - long timestamp2 = i.getCreateTime().getTime() / 1000; // 创建时间 - - // 将时间戳转换为Instant对象 - Instant instant1 = Instant.ofEpochSecond(timestamp1); - Instant instant2 = Instant.ofEpochSecond(timestamp2); - - // 计算两个时间戳之间的小时差 - Duration duration = Duration.between(instant1, instant2); - long hours = duration.toHours(); - Integer number = Integer.valueOf((int)hours); - int i1 = 48; - int ci = 0; - while (number > i1) { - i1 +=48; - ci += 1; - } - //查询超时的记录 - List list = aftersalesOvertimeFineService.list(Wrappers.query().lambda() - .eq(AftersalesOvertimeFineEntity::getWorkOrderId, i.getId()) - ); - int size = list.size(); - for (int q = 0; q < ci ; q++){ - //第一次超时 - if(size == 0 ){ - //处理超时数据 - AftersalesProcessorEntity processor = new AftersalesProcessorEntity(); - processor.setProcessingStatus("3");//回复超时 - processor.setId(i.getProcessorId()); - aftersalesProcessorService.updateById(processor); - //添加超时记录 - AftersalesOvertimeFineEntity overtimeFineEntity = new AftersalesOvertimeFineEntity(); - overtimeFineEntity.setWorkOrderId(i.getId()); - overtimeFineEntity.setMoney(BigDecimal.valueOf(50)); - overtimeFineEntity.setTimeout(String.valueOf(hours)); - overtimeFineEntity.setBusinessId(i.getBusinessId()); - overtimeFineEntity.setBusinessName(i.getBusinessName()); - overtimeFineEntity.setProcessorId(i.getProcessorId()); - aftersalesOvertimeFineService.save(overtimeFineEntity); - }else if(q > size){ - //添加新的超时记录 - AftersalesOvertimeFineEntity overtimeFineEntity = new AftersalesOvertimeFineEntity(); - overtimeFineEntity.setWorkOrderId(i.getId()); - overtimeFineEntity.setMoney(BigDecimal.valueOf(50)); - overtimeFineEntity.setTimeout(String.valueOf(hours)); - overtimeFineEntity.setBusinessId(i.getBusinessId()); - overtimeFineEntity.setBusinessName(i.getBusinessName()); - overtimeFineEntity.setProcessorId(i.getProcessorId()); - aftersalesOvertimeFineService.save(overtimeFineEntity); - - } - } - - }); - - } - - }*/ - } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 9cd021b05..158990a3d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -263,22 +263,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl strings = StringSplitUtil.StringSplitToList(distributionDeliveryList.getTrainNumbers()); - if (!strings.isEmpty()){ + if (!strings.isEmpty()) { distributionDeliveryList.setTrainNumberList(strings); } } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if (Func.isEmpty(myCurrentWarehouse)){ + if (Func.isEmpty(myCurrentWarehouse)) { List warehouseList = warehouseClient.getMyWarehouseList(); if (!warehouseList.isEmpty()) { List collect = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); distributionDeliveryList.setWarehouseIdList(collect); } - }else { + } else { List ids = new ArrayList<>(); ids.add(myCurrentWarehouse.getId()); distributionDeliveryList.setWarehouseIdList(ids); @@ -291,27 +291,27 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl exportDistributionDeliveryList(Map distributionDeliveryList) { - if (Func.isNotEmpty(distributionDeliveryList.get("ids"))){ + if (Func.isNotEmpty(distributionDeliveryList.get("ids"))) { //进行勾选操作 List deliveryId = Func.toLongList((String) distributionDeliveryList.get("ids")); - if (!deliveryId.isEmpty()){ - distributionDeliveryList.put("ids",deliveryId); + if (!deliveryId.isEmpty()) { + distributionDeliveryList.put("ids", deliveryId); } - }else { + } else { distributionDeliveryList.remove("ids"); } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if (Func.isEmpty(myCurrentWarehouse)){ + if (Func.isEmpty(myCurrentWarehouse)) { //未选择仓库查看当前登录人可以进行操作的仓库 List warehouseList = warehouseClient.getMyWarehouseList(); - if (!warehouseList.isEmpty()){ + if (!warehouseList.isEmpty()) { List ids = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); - distributionDeliveryList.put("warehouseIds",ids); + distributionDeliveryList.put("warehouseIds", ids); } - }else { + } else { List ids = new ArrayList<>(); ids.add(myCurrentWarehouse.getId()); - distributionDeliveryList.put("warehouseIds",ids); + distributionDeliveryList.put("warehouseIds", ids); } List distributionDeliveryListExcels = baseMapper.exportDistributionDeliveryList(distributionDeliveryList); return distributionDeliveryListExcels; @@ -360,23 +360,23 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl deliverySelfServices = distributionDeliverySelfService.list(Wrappers.query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2)); - if(!deliverySelfServices.isEmpty()){ + if (!deliverySelfServices.isEmpty()) { StringBuffer sb1 = new StringBuffer(); StringBuffer sb2 = new StringBuffer(); StringBuffer sb3 = new StringBuffer(); - deliverySelfServices.forEach(t->{ - if(!sb1.toString().isEmpty()){ + deliverySelfServices.forEach(t -> { + if (!sb1.toString().isEmpty()) { sb1.append("/"); } sb1.append(t.getDriverName()); - if(!sb2.toString().isEmpty()){ + if (!sb2.toString().isEmpty()) { sb2.append("/"); } sb2.append(t.getDriverPhone()); - if(!sb3.toString().isEmpty()){ + if (!sb3.toString().isEmpty()) { sb3.append("/"); } sb3.append(t.getVehicleNub()); @@ -426,9 +426,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl !distributionDeliveryListEntity.getId().equals(a.getDeliveryListId()) || !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId())); - if (flag){ + if (flag) { //该异常属于其他车次 String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(",")); - log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",distributionDeliveryListEntity.getTrainNumber(),collect); + log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}", distributionDeliveryListEntity.getTrainNumber(), collect); return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常"); } } - - List distributionParcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId()); if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) { //在客户列表进行装车 @@ -736,11 +734,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl info = new HashMap<>(); - info.put("orderPackageCode",parcelListEntity.getOrderPackageCode()); - info.put("warehouseId",myCurrentWarehouse.getId()); + Map info = new HashMap<>(); + info.put("orderPackageCode", parcelListEntity.getOrderPackageCode()); + info.put("warehouseId", myCurrentWarehouse.getId()); - warehouseUpdownTypeClient.downPackageAndDelTrayAndIsUpdate(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId(),"扫描装车进行下架、解托",false); + warehouseUpdownTypeClient.downPackageAndDelTrayAndIsUpdate(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "扫描装车进行下架、解托", false); Map map = new HashMap(); String distrilbutionloadingscanDTOJson = JSONObject.toJSONString(distrilbutionloadingscanDTO); @@ -751,12 +749,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>>>> 进入延迟队列处理包件相关信息状态"); rabbitTemplate.convertAndSend(RabbitConstant.ORDER_PACKAGE_STATUS_INFO_EXCHANGE, RabbitConstant.ORDER_PACKAGE_STATUS_INFO_ROUTING, map, message -> { @@ -764,8 +762,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>packageCode:{},reservationId:{}",distrilbutionloadingscanDTO.getBarcode(),distrilbutionloadingscanDTO.getReservationId()); + log.info("异常装车判定成功>>>>>>packageCode:{},reservationId:{}", distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getReservationId()); } } else if (distrilbutionloadingscanDTO.getType() == 2) { log.info("#########!!!!!!!!!!!!!!!!!--------- 000000000 type={}", distrilbutionloadingscanDTO.getType()); @@ -924,20 +922,20 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); - map.put("orderPackageCode",orderPackages); - map.put("warehouseId",myCurrentWarehouse.getId()); + Map map = new HashMap<>(); + map.put("orderPackageCode", orderPackages); + map.put("warehouseId", myCurrentWarehouse.getId()); warehouseUpdownTypeClient.downDeliveryPackage(map); } //维护预约的信息 @@ -972,7 +970,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl contents = new ArrayList<>(); PushData pushData = PushData.builder() @@ -992,35 +990,35 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:"); - if (Func.isNotEmpty(a)){ + if (Func.isNotEmpty(a)) { boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); - if (flag){ + if (flag) { //正在操作，请稍后重试 throw new RuntimeException("该包件正在被操作,请稍后再试!!!"); - }else { + } else { packageLockIds.addAll(a); - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,60L); + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); } - }else { - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L); + } else { + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); } } //备货库位下架 - log.info("备货库位下架>>>>>>>>>>>>>>>>>>>>>>jsonObjects:{}",jsonObjects); + log.info("备货库位下架>>>>>>>>>>>>>>>>>>>>>>jsonObjects:{}", jsonObjects); warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects); //查询已装车件数 // String str = getLoadingMsg(distrilbutionloadingscanDTO); trunklinePackageTrackLogClient.addPackageTrackLog(aaa); Integer carLaodNum = getCarLaodNum(distrilbutionloadingscanDTO.getDeliveryId()); - return Resp.scanSuccessWithData("装车成功", carLaodNum + "件", carLaodNum); + return Resp.scanSuccessWithData("装车成功", carLaodNum + "件", carLaodNum); } private void extracteOrderPackageStatus(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO, DistributionParcelListEntity parcelListEntity, BasicdataWarehouseEntity myCurrentWarehouse, DistributionReservationEntity reservationEntity) { - Map map = new HashMap<>(); - map.put("orderPackageCode",parcelListEntity.getOrderPackageCode()); + Map map = new HashMap<>(); + map.put("orderPackageCode", parcelListEntity.getOrderPackageCode()); map.put("warehouseId", myCurrentWarehouse.getId()); //包件配送下架 warehouseUpdownTypeClient.downDeliveryPackage(map); @@ -1033,157 +1031,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl trayGoodIds = voGoodsLsit.stream().filter(v -> v.getAssociationType().equals("3")).map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toList()); - //此时经过过滤后的包件ID和托盘上的所有包件ID数量一致，视为该托盘上的均为包件 -// if (voGoodsLsit.size() == trayGoodIds.size()) { -// List parcelListEntities = distributionParcelListService.listByIds(trayGoodIds); -//// if (trayLoadingStatus){ -//// return Resp.scanFail("托盘装车完毕","托盘货物已装车完毕"); -//// } -// -// if (Func.isNotEmpty(loadscanEntityList) && loadscanEntityList.size() > 0 && trayLoadingStatus) { -// return Resp.scanFail("重复扫描", "重复扫描"); -// } -// if (Func.isEmpty(parcelListEntities) || parcelListEntities.size() <= 0) { -// return Resp.scanFail("操作失败", "该托盘上无货物信息"); -// } -//// if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) { -//// //存在客户 这里就是针对客户进行的整托装车 -//// List parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId()); -//// Map parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2)); -//// boolean reservationFlag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(parcelListEntityMap.get(p.getId()))); -//// if (reservationFlag) { -//// List reservationLoadscanEntities = new ArrayList<>(); -//// for (DistributionParcelListEntity parcelListEntity : parcelListEntities) { -//// if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) { -//// parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); -//// parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); -//// distributionParcelListService.updateById(parcelListEntity); -//// DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getDeliveryId())) { -//// loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); -//// } -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverName())) { -//// loadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); -//// } -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleNub())) { -//// loadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); -//// } -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleId())) { -//// loadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); -//// } -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverPhone())) { -//// loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); -//// } -//// loadscanEntity.setOrderId(parcelListEntity.getStockArticleId()); -//// loadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode()); -//// loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId()); -//// loadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId()); -//// loadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber()); -//// loadscanEntity.setPackageNub(parcelListEntity.getQuantity()); -//// loadscanEntity.setPackageId(parcelListEntity.getId()); -//// loadscanEntity.setScanTime(new Date()); -//// BladeUser user = AuthUtil.getUser(); -//// loadscanEntity.setScanUser(user.getUserName()); -//// loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); -//// loadscanEntity.setOneClick(1); -//// loadscanEntity.setScanType("2"); -//// loadscanEntity.setScanStatus("1"); -//// loadscanEntity.setIsInsert(1); -//// loadscanEntity.setMsg("司机按照预约整托装车"); -//// loadscanEntity.setTrayNo(trayTypeDataVO.getTrayCode()); -//// reservationLoadscanEntities.add(loadscanEntity); -//// Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); -//// //更新签收表的装车数量 -//// Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub()); -////// loadingNum.getAndAdd(loadscanEntity.getPackageNub()); -//// } -//// } -////// str.append("预约客户整托装车"); -//// distributionLoadscanService.saveBatch(reservationLoadscanEntities); -//// //这里则进行整托装车的数据构建 -//// } else { -//// return Resp.scanFail("整托装车失败", "存在其他客户货物"); -//// } -//// } else { -//// //不存在客户 这里就是针对配送任务进行的整托装车 -//// List deliveryPackageList = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId()); -//// Map deliveryPackageMap = deliveryPackageList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2)); -//// boolean delivaryFlag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(deliveryPackageMap.get(p.getId()))); -//// if (delivaryFlag) { -//// List deliveryLoadscanEntities = new ArrayList<>(); -//// for (DistributionParcelListEntity parcelListEntity : parcelListEntities) { -//// if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) { -//// //查询出这个包件属于哪个客户 -//// DistributionReservationEntity reservationEntity = distributionDeliveryListMapper.selectReservationByPackageAndDeliveryId(parcelListEntity.getOrderPackageCode(), distrilbutionloadingscanDTO.getDeliveryId()); -//// parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); -//// parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); -//// distributionParcelListService.updateById(parcelListEntity); -//// DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getDeliveryId())) { -//// loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); -//// } -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverName())) { -//// loadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); -//// } -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleNub())) { -//// loadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); -//// } -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleId())) { -//// loadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); -//// } -//// if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverPhone())) { -//// loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); -//// } -//// loadscanEntity.setOrderId(parcelListEntity.getStockArticleId()); -//// loadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode()); -//// //查询出这个包件属于哪个客户 -//// -//// loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId()); -//// loadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId()); -//// loadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber()); -//// loadscanEntity.setPackageNub(parcelListEntity.getQuantity()); -//// loadscanEntity.setPackageId(parcelListEntity.getId()); -//// loadscanEntity.setReservationId(reservationEntity.getId()); -//// loadscanEntity.setScanTime(new Date()); -//// BladeUser user = AuthUtil.getUser(); -//// loadscanEntity.setScanUser(user.getUserName()); -//// loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); -//// loadscanEntity.setOneClick(1); -//// loadscanEntity.setScanType("2"); -//// loadscanEntity.setScanStatus("1"); -//// loadscanEntity.setIsInsert(1); -//// loadscanEntity.setMsg("司机按照计划整托装车"); -//// loadscanEntity.setTrayNo(trayTypeDataVO.getTrayCode()); -//// deliveryLoadscanEntities.add(loadscanEntity); -//// //更新装车时间 -//// Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); -//// //更新签收表的装车数量 -//// Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub()); -////// loadingNum.getAndAdd(loadscanEntity.getPackageNub()); -//// } -//// } -////// str.append("配送计划整托装车"); -//// distributionLoadscanService.saveBatch(deliveryLoadscanEntities); -//// //这里则进行整托装车的数据构建 -//// } else { -//// return Resp.scanFail("整托装车失败", "存在其他客户货物"); -//// } -//// } -// //进行装车状态维护 -// //TODO 需要一个维护状态的异步方法 -// distributionAsyncService.checkLoadingByDelivery(distrilbutionloadingscanDTO.getDeliveryId()); -// } else { -// log.error("托盘存放货物类型不单一：{}", trayTypeDataVO); -// } -// } -// } -// //查询已装车件数 -// String str = getLoadingMsg(distrilbutionloadingscanDTO); -// return Resp.scanSuccess("装车成功", str); -// } - - private Integer getCarLaodNum(Long deliveryId) { AtomicInteger loadingNum = new AtomicInteger(); Integer contNum_a = distributionLoadscanMapper.getLoadCountNum(deliveryId); @@ -1198,7 +1045,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); - map.put("orderPackageCode",updownrOderPackages); - map.put("warehouseId",myCurrentWarehouse.getId()); + Map map = new HashMap<>(); + map.put("orderPackageCode", updownrOderPackages); + map.put("warehouseId", myCurrentWarehouse.getId()); warehouseUpdownTypeClient.downDeliveryPackage(map); } List packageIds = updatePackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); @@ -2101,8 +1948,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>>装车修改库存品包件>装车包件码:{},",disStockListDetailEntity.getStockPackageCode()); - DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = getDistributionLoadscaninvnEntity(distrilbutionloadingscanDTO, distributionDeliverySelfEntity, disStockListDetailEntities,myCurrentWarehouse); + log.info(">>>>>>>>>>>>>>>>>>>装车修改库存品包件>装车包件码:{},", disStockListDetailEntity.getStockPackageCode()); + DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = getDistributionLoadscaninvnEntity(distrilbutionloadingscanDTO, distributionDeliverySelfEntity, disStockListDetailEntities, myCurrentWarehouse); packageLockIds.add(distributionLoadscaninvnEntity.getInventoryPackageId()); distributionLoadscaninvnService.save(distributionLoadscaninvnEntity); //查询本车次是否第一次扫码,没有则更新上车时间 @@ -2167,12 +2014,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl jsonObjects = new ArrayList<>(); JSONObject jsonObject = new JSONObject(); - jsonObject.put("code",distributionLoadscaninvnEntity.getOrderPackageCode()); - jsonObject.put("warehouseId",myCurrentWarehouse.getId()); - jsonObject.put("taskId",distributionLoadscaninvnEntity.getReservationId()); - jsonObject.put("type",2); - jsonObject.put("num",1); - jsonObject.put("remark","装车下架"); + jsonObject.put("code", distributionLoadscaninvnEntity.getOrderPackageCode()); + jsonObject.put("warehouseId", myCurrentWarehouse.getId()); + jsonObject.put("taskId", distributionLoadscaninvnEntity.getReservationId()); + jsonObject.put("type", 2); + jsonObject.put("num", 1); + jsonObject.put("remark", "装车下架"); jsonObjects.add(jsonObject); warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects); } else { @@ -2180,19 +2027,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:"); - if (Func.isNotEmpty(a)){ + if (Func.isNotEmpty(a)) { boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); - if (flag){ + if (flag) { //正在操作，请稍后重试 throw new RuntimeException("该包件正在被操作,请稍后再试!!!"); - }else { + } else { packageLockIds.addAll(a); - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,60L); + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); } - }else { - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L); + } else { + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); } } String msg = getLoadingMsg(distrilbutionloadingscanDTO); @@ -2208,7 +2055,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl disStockListDetailEntities,BasicdataWarehouseEntity warehouseEntity) { + private static DistributionLoadscaninvnEntity getDistributionLoadscaninvnEntity(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO, DistributionDeliverySelfEntity distributionDeliverySelfEntity, List disStockListDetailEntities, BasicdataWarehouseEntity warehouseEntity) { DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity(); BladeUser user = AuthUtil.getUser(); String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -2450,7 +2297,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl customList = distributionDeliveryInfoMapper.selectAppcustomListPage(distributionDeliveryList.getId()); // 查询所有的预约单ID for (DistributionAppReservationVO distributionAppReservationVO : customList) { - if (Objects.equals(distributionAppReservationVO.getReservationNum(), distributionAppReservationVO.getLoadingNub())){ + if (Objects.equals(distributionAppReservationVO.getReservationNum(), distributionAppReservationVO.getLoadingNub())) { distributionAppReservationVO.setIsload("是"); - }else { + } else { distributionAppReservationVO.setIsload("否"); } - if (Objects.equals(distributionAppReservationVO.getReservationNum(), distributionAppReservationVO.getStockupNum())){ + if (Objects.equals(distributionAppReservationVO.getReservationNum(), distributionAppReservationVO.getStockupNum())) { distributionAppReservationVO.setIsstock("是"); - }else { + } else { distributionAppReservationVO.setIsstock("否"); } List trayList = new ArrayList<>(); - //查询满足条件的托盘码 - List distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(distributionAppReservationVO.getId()); - int trayNum = 0; - if (Func.isNotEmpty(distributionParcelListEntities)) { - Map map = new HashMap<>(); - List packageIds = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); - map.put("packageIds",packageIds); - map.put("warehouseId",myCurrentWarehouse.getId()); - List packageTrayInfo = warehouseTrayGoodsClient.getPackageTrayInfo(map); - List packageCodeList = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toList()); + //查询满足条件的托盘码 + List distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(distributionAppReservationVO.getId()); + int trayNum = 0; + if (Func.isNotEmpty(distributionParcelListEntities)) { + Map map = new HashMap<>(); + List packageIds = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); + map.put("packageIds", packageIds); + map.put("warehouseId", myCurrentWarehouse.getId()); + List packageTrayInfo = warehouseTrayGoodsClient.getPackageTrayInfo(map); + List packageCodeList = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toList()); // List collect = trayList.stream().distinct().collect(Collectors.toList()); - if (Func.isNotEmpty(packageTrayInfo)){ - List trayIds = packageTrayInfo.stream().map(WarehouseTrayGoodsEntity::getTrayId).distinct().collect(Collectors.toList()); - for (Long trayId : trayIds) { - List trayIdList = warehouseTrayGoodsClient.getTrayIdList(trayId.toString(), ""); - //判断该托盘上的货物都存在于计划之中 - boolean isLoadingTrayFlag = trayIdList.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).allMatch(t -> packageCodeList.contains(t)); - if (isLoadingTrayFlag) { - trayNum += 1; - } + if (Func.isNotEmpty(packageTrayInfo)) { + List trayIds = packageTrayInfo.stream().map(WarehouseTrayGoodsEntity::getTrayId).distinct().collect(Collectors.toList()); + for (Long trayId : trayIds) { + List trayIdList = warehouseTrayGoodsClient.getTrayIdList(trayId.toString(), ""); + //判断该托盘上的货物都存在于计划之中 + boolean isLoadingTrayFlag = trayIdList.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).allMatch(t -> packageCodeList.contains(t)); + if (isLoadingTrayFlag) { + trayNum += 1; } } - } - //统计满足条件的托盘 - distributionAppReservationVO.setTrayNum(trayNum); + + } + //统计满足条件的托盘 + distributionAppReservationVO.setTrayNum(trayNum); } return customList; } - private List localFindAllParcelListEntities(List allParcelListEntities, Long stockArticleId) { + private List localFindAllParcelListEntities(List allParcelListEntities, Long stockArticleId) { List temp = new ArrayList<>(); for (DistributionParcelListEntity allParcelListEntity : allParcelListEntities) { - if(allParcelListEntity.getStockArticleId().equals(stockArticleId)){ + if (allParcelListEntity.getStockArticleId().equals(stockArticleId)) { temp.add(allParcelListEntity); } } @@ -2756,6 +2603,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl temp = new ArrayList<>(); for (DistributionReservationStockarticleEntity reservationStockarticleEntityList : reservationStockarticleEntityLists) { - if(reservationStockarticleEntityList.getReservationId().equals(id)){ + if (reservationStockarticleEntityList.getReservationId().equals(id)) { temp.add(reservationStockarticleEntityList); } } @@ -3019,8 +2867,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode()); - if (Func.isNotEmpty(a)){ + if (Func.isNotEmpty(a)) { boolean flag = a.stream().anyMatch(f -> packageLockIds.contains(f)); - if (flag){ - throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试"); - }else { + if (flag) { + throw new RuntimeException(s.getOrderCode() + "正在操作,请刷新后尝试"); + } else { packageLockIds.addAll(a); - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,1*60L); + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(), packageLockIds, 1 * 60L); } - }else { - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,1*60L); + } else { + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(), packageLockIds, 1 * 60L); } } }); @@ -3237,8 +3085,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl ids = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + parcelListEntity.getOrderCode()); int indexOf = ids.indexOf(parcelListEntity.getId()); - if (indexOf>0){ + if (indexOf > 0) { ids.remove(indexOf); - bladeRedis.set("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + parcelListEntity.getOrderCode(),ids); + bladeRedis.set("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + parcelListEntity.getOrderCode(), ids); } } - String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getUser().getNickName()+"取消商配计划配车,操作方式:对已有计划订单进行勾选包件取消操作,预约任务号:"+reservationEntity.getReservationCode(); - JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(),content , WorkNodeEnums.PLAN_DISTRIBUTION.getCode()); + String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getUser().getNickName() + "取消商配计划配车,操作方式:对已有计划订单进行勾选包件取消操作,预约任务号:" + reservationEntity.getReservationCode(); + JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_DISTRIBUTION.getCode()); logs.add(js); }); @@ -3504,15 +3352,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode()); - if (Func.isNotEmpty(a)){ + if (Func.isNotEmpty(a)) { boolean flag = a.stream().anyMatch(f -> packageLockIds.contains(f)); - if (flag){ - throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试"); - }else { + if (flag) { + throw new RuntimeException(s.getOrderCode() + "正在操作,请刷新后尝试"); + } else { packageLockIds.addAll(a); - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,5*60L); + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(), packageLockIds, 5 * 60L); } } } @@ -3535,8 +3383,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>reservationCodes:{}",needStockUpReservationList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))); + log.info("修改市配配送任务需要进行备货的预约计划>>>reservationCodes:{}", needStockUpReservationList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))); //需要进行备货的预约列表 stockupEntity = new DistributionStockupEntity(); stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue()); @@ -3982,13 +3830,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>:{}",distributionReservationEntity.getId()); + log.info("编辑配送车次维护预约备货状态 reservationId>>>>>>>>>>>>>>>>>:{}", distributionReservationEntity.getId()); } - if (!newstockUpIds.isEmpty()){ - log.info("新增预约单至配送计划>>>>>>>>>>>>>>>>>>>>ids:{}",newstockUpIds); + if (!newstockUpIds.isEmpty()) { + log.info("新增预约单至配送计划>>>>>>>>>>>>>>>>>>>>ids:{}", newstockUpIds); distributionReservationService.update(Wrappers.update().lambda() - .in(DistributionReservationEntity::getId,newstockUpIds) - .set(DistributionReservationEntity::getStockupStatus,ReservationStockupStatusConstant.daibeihuo.getValue()) + .in(DistributionReservationEntity::getId, newstockUpIds) + .set(DistributionReservationEntity::getStockupStatus, ReservationStockupStatusConstant.daibeihuo.getValue()) ); } } @@ -4031,15 +3879,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>>>ids:{}",newIds); + if (!newIds.isEmpty()) { + log.info("新增预约单至配送计划 维护预约单状态>>>>>>>>>>>>>>>>>>>>ids:{}", newIds); distributionReservationService.update(Wrappers.update().lambda() - .in(DistributionReservationEntity::getId,newIds) - .set(DistributionReservationEntity::getReservationStatus,ReservationStatusConstant.daipeisong.getValue()) + .in(DistributionReservationEntity::getId, newIds) + .set(DistributionReservationEntity::getReservationStatus, ReservationStatusConstant.daipeisong.getValue()) ); - String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"转车次任务,操作方式:车次添加预约计划,车次号:"+deliveryListEntity.getTrainNumber(); + String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getUser().getNickName() + "转车次任务,操作方式:车次添加预约计划,车次号:" + deliveryListEntity.getTrainNumber(); String ids = oldIds.stream().map(String::valueOf).collect(Collectors.joining(",")); - distributionAsyncService.recordsReservationDeliveryLog(ids,myCurrentWarehouse,AuthUtil.getUser(),deliveryListEntity.getTrainNumber(),WorkNodeEnums.PLAN_DISTRIBUTION.getCode(),content); + distributionAsyncService.recordsReservationDeliveryLog(ids, myCurrentWarehouse, AuthUtil.getUser(), deliveryListEntity.getTrainNumber(), WorkNodeEnums.PLAN_DISTRIBUTION.getCode(), content); } oldReservation.forEach((m, n) -> { @@ -4051,18 +3899,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() - .eq(DistributionStockupInfoEntity::getReservationId,reservationEntity.getId()) - .set(DistributionStockupInfoEntity::getStockStatus,"4") + .eq(DistributionStockupInfoEntity::getReservationId, reservationEntity.getId()) + .set(DistributionStockupInfoEntity::getStockStatus, "4") ); oldIds.add(reservationEntity.getId()); }); if (!oldIds.isEmpty()) { - String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"取消配车计划,操作方式:车次移除预约计划,车次号:"+deliveryListEntity.getTrainNumber(); + String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getUser().getNickName() + "取消配车计划,操作方式:车次移除预约计划,车次号:" + deliveryListEntity.getTrainNumber(); String ids = oldIds.stream().map(String::valueOf).collect(Collectors.joining(",")); - distributionAsyncService.recordsReservationDeliveryLog(ids,myCurrentWarehouse,AuthUtil.getUser(),deliveryListEntity.getTrainNumber(),WorkNodeEnums.CANCEL_DISTRIBUTION.getCode(),content); + distributionAsyncService.recordsReservationDeliveryLog(ids, myCurrentWarehouse, AuthUtil.getUser(), deliveryListEntity.getTrainNumber(), WorkNodeEnums.CANCEL_DISTRIBUTION.getCode(), content); } //修改备货信息 @@ -4095,7 +3943,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); List reservationId = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).collect(Collectors.toList()); - Map map = new HashMap<>(); + Map map = new HashMap<>(); if (!reservationId.isEmpty()) { for (Long l : reservationId) { List distributionStockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(l); - distributionStockArticleVOS.forEach(s->{ - map.put(s.getId(),s.getReservationCode()); + distributionStockArticleVOS.forEach(s -> { + map.put(s.getId(), s.getReservationCode()); }); } } @@ -4203,7 +4051,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>> distributionParcelListVO {}", distributionParcelListVO); distributionParcelListVO.setDeliveryTrainNumber(deliveryListEntity.getTrainNumber()); - if (!map.isEmpty()){ + if (!map.isEmpty()) { distributionParcelListVO.setReservationCode(map.get(distributionParcelListVO.getStockArticleId())); } if (Func.isNotEmpty(loadingDataMap)) { @@ -4452,12 +4300,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); List reservationId = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).collect(Collectors.toList()); - Map map = new HashMap<>(); + Map map = new HashMap<>(); if (!reservationId.isEmpty()) { for (Long l : reservationId) { List distributionStockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(l); - distributionStockArticleVOS.forEach(s->{ - map.put(s.getId(),s.getReservationCode()); + distributionStockArticleVOS.forEach(s -> { + map.put(s.getId(), s.getReservationCode()); }); } } @@ -4471,7 +4319,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>> distributionParcelListVO {}", distributionParcelListVO); distributionParcelListVO.setDeliveryTrainNumber(deliveryListEntity.getTrainNumber()); - if (!map.isEmpty()){ + if (!map.isEmpty()) { distributionParcelListVO.setReservationCode(map.get(distributionParcelListVO.getStockArticleId())); } if (Func.isNotEmpty(loadingDataMap)) { @@ -4610,8 +4458,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = distributionReservationStockarticleMapper.selectList(Wrappers.query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, reservationEntity.getId()).ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())); reservationStockarticleEntityList.forEach(o -> { @@ -4748,7 +4596,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl collect = list.stream().filter(l -> !l.getScanStatus().equals(LoadingStatusConstant.quxiao.getValue())).map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList()); // int loadingNum = list.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum(); // rs.setLoadedinNumber(loadingNum); - HashSet strings = new HashSet<>(collect); + HashSet strings = new HashSet<>(collect); rs.setScanUser(String.join(",", strings)); //查询库存品包件列表 List stockListDetailEntityList = disStockListDetailService.list(Wrappers.query().lambda() @@ -4758,37 +4606,37 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl InventoryLoadingStatusConstant.yizhuangche.getValue().equals(f.getStockLockingStatus())).mapToInt(DisStockListDetailEntity::getNum).sum(); rs.setLoadedinNumber(loadingNum); - if (loadingNum == rs.getReservationNum() ){ + if (loadingNum == rs.getReservationNum()) { rs.setLoadingStatusName(DeliveryLoadingStatusConstant.yizhuangche.getName()); - }else { - if (loadingNum > 0){ + } else { + if (loadingNum > 0) { rs.setLoadingStatusName(DeliveryLoadingStatusConstant.bunfenzhuangche.getName()); } - if (loadingNum == 0){ + if (loadingNum == 0) { rs.setLoadingStatusName(DeliveryLoadingStatusConstant.weizhuangche.getName()); } } int signingNum = stockListDetailEntityList.stream().filter(f -> InventorySigningStatusConstant.yiqianshou.getValue().equals(f.getStockSignfoStatus())).mapToInt(DisStockListDetailEntity::getNum).sum(); - if (signingNum == rs.getReservationNum() ){ + if (signingNum == rs.getReservationNum()) { rs.setSigningStatusName(ReservationSigningStatusConstant.yiqianshou.getName()); - }else { - if (signingNum > 0){ + } else { + if (signingNum > 0) { rs.setSigningStatusName(ReservationSigningStatusConstant.bufenqianshou.getName()); } - if (signingNum == 0){ + if (signingNum == 0) { rs.setSigningStatusName(ReservationSigningStatusConstant.daiqianshou.getName()); } } rs.setSignedinNumber(signingNum); int stockupNum = stockListDetailEntityList.stream().filter(f -> InventoryStockUpStatusConstant.yibeihuo.getValue().equals(f.getStockStatus())).mapToInt(DisStockListDetailEntity::getNum).sum(); rs.setStockupNum(stockupNum); - if (stockupNum == rs.getReservationNum()){ + if (stockupNum == rs.getReservationNum()) { rs.setStockUpStatusName(StockupStatusConstant.yibeihuo.getName()); - }else { - if (stockupNum > 0){ + } else { + if (stockupNum > 0) { rs.setStockUpStatusName(StockupStatusConstant.beihuozhong.getName()); } - if (stockupNum == 0){ + if (stockupNum == 0) { rs.setStockUpStatusName(StockupStatusConstant.daibeihuo.getName()); } } @@ -4876,7 +4724,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl printBatch(String ids, Integer type) throws Exception { - BasicPrintTemplateEntity template = getPrintTemplate(type); String html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl()); @@ -5089,7 +4936,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl orderPackageIds = ts.stream() .map(DistributionParcelListEntity::getId) // 获取每个对象的包件ID .collect(Collectors.toList()); - if (Func.isNotEmpty(orderPackageCodes)){ + if (Func.isNotEmpty(orderPackageCodes)) { List allocationStrList = distributionParcelListMapper.selectAllocationInforByOrderPackageCode(orderPackageCodes, distrilbutionBillLadingEntity.getWarehouseId()); String allocationStr = StringUtils.join(allocationStrList, ","); tempMap.put("货位", allocationStr); @@ -5328,7 +5175,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageLockIds = new ArrayList<>(); + List packageLockIds = new ArrayList<>(); List parcelListEntities = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()) .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) @@ -5404,7 +5251,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl jsonObjects = new ArrayList<>(); JSONObject jsonObject = new JSONObject(); - jsonObject.put("code",loadscanEntity.getOrderPackageCode()); - jsonObject.put("warehouseId",myCurrentWarehouse.getId()); - jsonObject.put("taskId",loadscanEntity.getReservationId()); - jsonObject.put("type",1); - jsonObject.put("num",1); - jsonObject.put("remark","异常装车下架"); + jsonObject.put("code", loadscanEntity.getOrderPackageCode()); + jsonObject.put("warehouseId", myCurrentWarehouse.getId()); + jsonObject.put("taskId", loadscanEntity.getReservationId()); + jsonObject.put("type", 1); + jsonObject.put("num", 1); + jsonObject.put("remark", "异常装车下架"); jsonObjects.add(jsonObject); warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects); //修改包件装车状态 @@ -5475,9 +5322,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); - map.put("orderPackageCode",distrilbutionloadingscanDTO.getBarcode()); - map.put("warehouseId",myCurrentWarehouse.getId()); + Map map = new HashMap<>(); + map.put("orderPackageCode", distrilbutionloadingscanDTO.getBarcode()); + map.put("warehouseId", myCurrentWarehouse.getId()); //出库 warehouseUpdownTypeClient.downDeliveryPackage(map); //查询本车次是否第一次扫码,没有则更新上车时间 @@ -5509,19 +5356,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ); - if (Func.isNotEmpty(a)){ + if (!packageLockIds.isEmpty()) { + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:"); + if (Func.isNotEmpty(a)) { boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); - if (flag){ + if (flag) { //正在操作，请稍后重试 throw new RuntimeException("该包件正在被操作,请稍后再试!!!"); - }else { + } else { packageLockIds.addAll(a); - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L); + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); } - }else { - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,60L); + } else { + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); } } @@ -5694,12 +5541,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0) { str.append("异常").append(abnormalLoadingNum.get() + "件"); } - if (!packageLockIds.isEmpty()){ + if (!packageLockIds.isEmpty()) { List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:"); - if (Func.isNotEmpty(a)){ + if (Func.isNotEmpty(a)) { boolean aaa = a.stream().anyMatch(any -> packageLockIds.contains(any)); - if (aaa){ + if (aaa) { //正在操作，请稍后重试 throw new RuntimeException("该包件正在被操作,请稍后再试!!!"); - }else { + } else { packageLockIds.addAll(a); - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L); + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); } - }else { - bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds ,60L); + } else { + bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); } } return Resp.scanSuccess("装车成功", str.toString()); @@ -5904,9 +5751,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>>>>>>reservationId:{},packageCode:{}",distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getOrderPackageCode()); - return Resp.scanFail("包件已签收","包件已签收"); + if (2 == distributionLoadscanEntity.getSignforState()) { + log.info("滞留扫描失败，包件已签收>>>>>>>>>>>>>>>>>>>>>>>reservationId:{},packageCode:{}", distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getOrderPackageCode()); + return Resp.scanFail("包件已签收", "包件已签收"); } DistributionRetentionScanVo retentionScanVo = baseMapper.selectRetentionPackage(distributionLoadscanEntity.getOrderPackageCode(), distributionLoadscanEntity.getDeliveryId()); retentionScanVos.add(retentionScanVo); @@ -5922,8 +5769,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl orderIds = reservationStockarticleEntityList.stream().filter(rs -> Func.isNotEmpty(rs.getIsZero()) && rs.getIsZero().equals(IsOrNoConstant.yes.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); if (Func.isEmpty(orderIds)) { - log.info("####################配送任务下无零担信息:{}",orderIds); + log.info("####################配送任务下无零担信息:{}", orderIds); return Resp.scanFail("查询错误", "该任务无零担订单"); } List parcelNumberVOS = new ArrayList<>(); @@ -6110,11 +5957,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl aaa =new ArrayList<>(); + List aaa = new ArrayList<>(); //订制品 //需要对该配送任务下的该包件进行取消状态标识 int row = distributionReservationMapper.cancelReservationPackage(reservationId, orderPackageId); @@ -6138,8 +5985,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl customList = distributionDeliveryInfoMapper.selectClientList(deliveryId, distributionReservationDTO); List distributionDeliveryInfoVOS = null; if (!customList.isEmpty()) { - distributionDeliveryInfoVOS = handleClient(customList); + distributionDeliveryInfoVOS = handleClient(customList); } return page.setRecords(distributionDeliveryInfoVOS); } - public List handleClient(List customList){ + public List handleClient(List customList) { customList.forEach(c -> { if (Func.isNotEmpty(c.getLoadingStatus())) { switch (c.getLoadingStatus()) { @@ -6429,8 +6275,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getDriverCar(String kind, Long deliveryListEntityId) { Map map = new HashMap<>(); String dirverName = null; @@ -6591,7 +6435,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Integer.parseInt(map1.get("数量").toString())).sum()); - log.info(">>>>>>>>>>>>>>>>>>预约打印模板查看备货信息》》》》》》》》》》》》:{}",distributionReservationEntity.getRemarks()); + log.info(">>>>>>>>>>>>>>>>>>预约打印模板查看备货信息》》》》》》》》》》》》:{}", distributionReservationEntity.getRemarks()); map.put("备注", distributionReservationEntity.getRemarks()); } @@ -7125,7 +6969,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl collect = distributionReservationEntities.stream().filter(f -> (f.getReservationNum() + f.getReservationStockListNum()) > 0).collect(Collectors.toList()); - log.info(deliveryListEntity.getTrainNumber()+"#################维护配送任务客户数>>>>>>>,:{}",collect.size()); + log.info(deliveryListEntity.getTrainNumber() + "#################维护配送任务客户数>>>>>>>,:{}", collect.size()); deliveryListEntity.setCustomersNumber(collect.size()); //查询订单数 Integer num = baseMapper.selectOrderNumByDeliveryId(deliveryId); @@ -7140,7 +6984,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0){ - log.info(method + "存在装车数据 装车件数>>>>>>>>>>:{}", (deliveryLoadingNum.getPackageLoadingQuantity()+deliveryLoadingNum.getInventoryLoadingQuantity())); + if (deliveryLoadingNum.getPackageLoadingQuantity() + deliveryLoadingNum.getInventoryLoadingQuantity() > 0) { + log.info(method + "存在装车数据 装车件数>>>>>>>>>>:{}", (deliveryLoadingNum.getPackageLoadingQuantity() + deliveryLoadingNum.getInventoryLoadingQuantity())); return R.fail(deliveryListEntity.getTrainNumber() + "存在装车包件!!!"); } @@ -7171,7 +7015,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionDeliveryInfoVOS = distributionDeliveryInfoMapper.selectClientListByDeliveryId(deliveryId); - List deliveryInfoVOS = handleClient(distributionDeliveryInfoVOS); + List deliveryInfoVOS = handleClient(distributionDeliveryInfoVOS); distributionDeliveryExcelDTO.setDeliveryInfoVOS(deliveryInfoVOS); // EXResource.put("client",deliveryInfoVOS); List distributionStockArticleVOS = distributionDeliveryInfoMapper.selectDistributionDeliveryOrderPageByDeliveryId(deliveryId); @@ -7270,17 +7114,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl wIds = null; - if (Strings.isNotBlank(warehouseIds)){ + if (Strings.isNotBlank(warehouseIds)) { wIds = Arrays.stream(warehouseIds.split(",")).map(Long::valueOf).collect(Collectors.toList()); } List rCode = null; - if (Strings.isNotBlank(reservationCode)){ + if (Strings.isNotBlank(reservationCode)) { rCode = Arrays.stream(reservationCode.split(",")).collect(Collectors.toList()); } - List pushNotification = distributionSignforMapper.pushNotification(wIds,rCode); - if (!pushNotification.isEmpty()){ + List pushNotification = distributionSignforMapper.pushNotification(wIds, rCode); + if (!pushNotification.isEmpty()) { for (PushNotificationDTO pushNotificationDTO : pushNotification) { distributionAsyncService.sendReviewFactory(pushNotificationDTO.getId(), pushNotificationDTO.getWarehouseName(), pushNotificationDTO.getWarehouseId()); } @@ -7290,69 +7134,122 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>> 车次状态维护1 代码执行 deliveryId={}",deliveryId); - String method = "###################DistributionDeliveryListServiceImpl执行方法maintenanceDeliveryInfo,"; - if (Func.isEmpty(deliveryId)) { - log.info(method + "参数缺失deliveryId:{}", deliveryId); - throw new RuntimeException("服务器正忙!!!"); + if (Objects.isNull(deliveryId)) { + throw new IllegalArgumentException("deliveryId 不能为空"); } - DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId); + DistributionDeliveryListEntity old = new DistributionDeliveryListEntity(); + DistributionDeliveryListEntity deliveryListEntity = getById(deliveryId); + + BeanUtils.copyProperties(deliveryListEntity, old); if (ObjectUtil.isEmpty(deliveryListEntity)) { - log.info(method + "查询配送失败，deliveryId:{}", deliveryId); - throw new RuntimeException("服务器正忙!!!"); + throw new RuntimeException("查询配送失败"); } - //查询指定配送计划装车件数 + + int deliveryQuantity = getDeliveryQuantity(deliveryListEntity); + int loadingNum = getLoadingNum(deliveryId); + + /** + * 更新配送状态。 + * 根据配送清单实体中的信息，更新配送数量和装载数量，以反映配送的实时进展。 + * @param deliveryListEntity 配送清单实体，包含需要更新的配送信息。 + * @param deliveryQuantity 更新的配送数量，用于调整配送状态。 + * @param loadingNum 装载数量，用于进一步细化配送状态的更新。 + */ + updateDeliveryStatus(deliveryListEntity, deliveryQuantity, loadingNum); + + + /** + * 更新配送清单实体。 + * 保存对配送清单实体所做的所有更新，确保数据的一致性和准确性。 + * @param deliveryListEntity 配送清单实体，包含所有需要更新的信息。 + */ + updateDeliveryListEntity(deliveryListEntity, old); + } + + private int getDeliveryQuantity(DistributionDeliveryListEntity deliveryListEntity) { + return deliveryListEntity.getDeliveryNumber() + (Objects.isNull(deliveryListEntity.getInventoryNub()) ? 0 : deliveryListEntity.getInventoryNub()); + } + + private int getLoadingNum(Long deliveryId) { DistributionLoadingNumDTO deliveryLoadingNum = distributionDeliveryListMapper.selectDeliveryLoadingNum(deliveryId); - log.info(">>>>>>>>>>>>>>> 车次状态维护2 代码执行 deliveryLoadingNum{}",deliveryLoadingNum); + return Func.isNotEmpty(deliveryLoadingNum) + ? deliveryLoadingNum.getInventoryLoadingQuantity() + deliveryLoadingNum.getPackageLoadingQuantity() + : 0; + } - int loadingNum = 0; - int deliveryQuantity = deliveryListEntity.getDeliveryNumber() + (Objects.isNull(deliveryListEntity.getInventoryNub()) ? 0 : deliveryListEntity.getInventoryNub()); - if (Func.isNotEmpty(deliveryLoadingNum)) { - loadingNum += deliveryLoadingNum.getInventoryLoadingQuantity() + deliveryLoadingNum.getPackageLoadingQuantity(); + private void updateDeliveryStatus(DistributionDeliveryListEntity deliveryListEntity, int deliveryQuantity, int loadingNum) { + // 检查配送数量是否为0，如果是，则记录错误日志并返回 + if (deliveryQuantity == 0) { + log.error("查询配送无计划数量，deliveryId: {}", deliveryListEntity.getId()); + return; } - if (deliveryQuantity != 0) { - if (loadingNum == deliveryQuantity) { - deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue()); - } else { - deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue()); - deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue()); - } - if (loadingNum == 0) { - deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue()); - } + // 根据装载数量与配送数量的关系，设置配送装载状态 + // 如果装载数量等于配送数量，设置为“已装车”；如果装载数量大于0但小于配送数量，设置为“部分装车”；否则设置为“未装车” + deliveryListEntity.setDeliveryListLoadingStatus( + loadingNum == deliveryQuantity ? DeliveryLoadingStatusConstant.yizhuangche.getValue() + : (loadingNum > 0 ? DeliveryLoadingStatusConstant.bunfenzhuangche.getValue() : DeliveryLoadingStatusConstant.weizhuangche.getValue())); - } else { - log.error(method + "查询配送无计划数量，deliveryId:{}", deliveryId); - } + // 根据装载数量是否等于配送数量且所有配送是否已完成签收，设置配送状态 + // 如果装载数量等于配送数量且所有配送已完成签收，设置为“已完成”；否则设置为“配送中” + deliveryListEntity.setDeliveryStatus(loadingNum == deliveryQuantity && isAllSignforCompleted(deliveryListEntity.getId()) + ? DeliveryStatusConstant.yiwancheng.getValue() + : DeliveryStatusConstant.peisongzhong.getValue()); + + } - //查询配送内有效的客户信息 + private boolean isAllSignforCompleted(Long deliveryId) { List signforEntities = baseMapper.selectSignforByDeliveryId(deliveryId); - boolean flag = signforEntities.stream().allMatch(s -> SignforStatusConstant.yiqianshou.getValue().equals(s.getSigningStatus())); - log.info(method+"维护配送状态>>>>>>>>>>>>deliveryId:{}",deliveryId); - log.info(method+"维护配送状态>>>>>>>>>>>>状态是否满足完成:{}",flag); - if (flag){ - deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue()); + return signforEntities.stream().allMatch(s -> SignforStatusConstant.yiqianshou.getValue().equals(s.getSigningStatus())); + } + + + private void updateDeliveryListEntity(DistributionDeliveryListEntity deliveryListEntity, DistributionDeliveryListEntity old) { + + // 判断传入的对象是否是否为null + if (Objects.isNull(deliveryListEntity)) { + throw new IllegalArgumentException("deliveryListEntity 不能为空"); } - this.updateById(deliveryListEntity); + if (Objects.isNull(old)) { + throw new IllegalArgumentException("old 不能为空"); + } + + + if(old.getDeliveryStatus()==null|| old.getDeliveryListLoadingStatus()==null){ + updateById(deliveryListEntity); + return ; + } + + // 判断传入的2个对象中的deliveryStatus 是否相同 + if (deliveryListEntity.getDeliveryStatus().equals(old.getDeliveryStatus())) { + return; + } + //判断传入2个对象中deliveryListLoadingStatus 是否相同 + if (deliveryListEntity.getDeliveryListLoadingStatus().equals(old.getDeliveryListLoadingStatus())) { + return; + } + + updateById(deliveryListEntity); + log.info("配送信息状态已更新，deliveryId: {}", deliveryListEntity.getId()); } - private JSONObject handleLogJSONObject(BasicdataWarehouseEntity warehouse,BladeUser user,String orderPackageCode,String content,Integer node) { + + private JSONObject handleLogJSONObject(BasicdataWarehouseEntity warehouse, BladeUser user, String orderPackageCode, String content, Integer node) { JSONObject trunklinePackageTrackLog = new JSONObject(); - trunklinePackageTrackLog.put("tenantId",user.getTenantId()); - trunklinePackageTrackLog.put("createTime",new Date()); - trunklinePackageTrackLog.put("createUser",user.getUserId()); - trunklinePackageTrackLog.put("updateUser",user.getUserId()); - trunklinePackageTrackLog.put("updateTime",new Date()); - trunklinePackageTrackLog.put("isDeleted",0); - trunklinePackageTrackLog.put("status",1); - trunklinePackageTrackLog.put("createDept",warehouse.getDepartment()); - trunklinePackageTrackLog.put("orderPackageCode",orderPackageCode); - trunklinePackageTrackLog.put("warehouseId",warehouse.getId()); - trunklinePackageTrackLog.put("warehouseName",warehouse.getName()); - trunklinePackageTrackLog.put("workNode",node); - trunklinePackageTrackLog.put("content",content); - trunklinePackageTrackLog.put("operator",user.getNickName()); + trunklinePackageTrackLog.put("tenantId", user.getTenantId()); + trunklinePackageTrackLog.put("createTime", new Date()); + trunklinePackageTrackLog.put("createUser", user.getUserId()); + trunklinePackageTrackLog.put("updateUser", user.getUserId()); + trunklinePackageTrackLog.put("updateTime", new Date()); + trunklinePackageTrackLog.put("isDeleted", 0); + trunklinePackageTrackLog.put("status", 1); + trunklinePackageTrackLog.put("createDept", warehouse.getDepartment()); + trunklinePackageTrackLog.put("orderPackageCode", orderPackageCode); + trunklinePackageTrackLog.put("warehouseId", warehouse.getId()); + trunklinePackageTrackLog.put("warehouseName", warehouse.getName()); + trunklinePackageTrackLog.put("workNode", node); + trunklinePackageTrackLog.put("content", content); + trunklinePackageTrackLog.put("operator", user.getNickName()); return trunklinePackageTrackLog; } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index db116ef98..b6638186a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1982,7 +1982,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl