From 3401c63ae6bc2e156a4accff93ec501ff9711cde Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 10 Jul 2024 01:38:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E6=8A=A5=E9=94=99=202=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98=E7=88=86=E7=B2=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 199 ++++++++---------- .../impl/WarehouseIndexServiceImpl.java | 2 +- 2 files changed, 88 insertions(+), 113 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 4d2c5bdf5..f78d50758 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -251,11 +251,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); List collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); distributionSignfor.setWarehouseIdList(collect); - }else{ + } else { List collect = new ArrayList<>(); collect.add(myCurrentWarehouse.getId()); distributionSignfor.setWarehouseIdList(collect); @@ -266,7 +266,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>> selectDistributionSignforPage",e); + log.error(">>> selectDistributionSignforPage", e); // 这里应该记录日志或者进行一些错误处理 return page.setRecords(Collections.emptyList()); } @@ -283,10 +283,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignforVOS, List reservationIds) { List distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationIds(reservationIds); - List list = disStockListDetailService.list(Wrappers.query().lambda() - .in(DisStockListDetailEntity::getReservationId, reservationIds) - .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) - ); +// List list = disStockListDetailService.list(Wrappers.query().lambda() +// .in(DisStockListDetailEntity::getReservationId, reservationIds) +// .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) +// ); List reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.query().lambda() .in(DistributionReservationZeroPackageEntity::getReservationId, reservationIds) .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) @@ -1717,8 +1717,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl handleStockUp(DistributionStockupEntity distributionStockupEntity) { List nodeVos = new ArrayList<>(); try { @@ -2384,102 +2382,82 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl exportDistributionSignforOwn(DistributionSignforVO distributionSignforVO) { - - - - // 转换创建时间 + try { + // 转换创建时间 distributionSignforVO.setCreateTime_query(DateUtil.format(distributionSignforVO.getCreateTime(), "yyyy:MM:dd HH:mm:ss")); - // 获取当前登录人仓库 + // 获取当前登录人仓库 - BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); - if(null == myCurrentWarehouse){ - List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); - List collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); - distributionSignforVO.setWarehouseIdList(collect); - }else{ - List collect = new ArrayList<>(); - collect.add(myCurrentWarehouse.getId()); - distributionSignforVO.setWarehouseIdList(collect); - } + BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); + if (null == myCurrentWarehouse) { + List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); + List collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); + distributionSignforVO.setWarehouseIdList(collect); + } else { + List collect = new ArrayList<>(); + collect.add(myCurrentWarehouse.getId()); + distributionSignforVO.setWarehouseIdList(collect); + } - List distributionSignforVOS; - try { - distributionSignforVOS = baseMapper.selectDistributionSignforPage(null, distributionSignforVO); - } catch (Exception e) { - log.error(">>> selectDistributionSignforPage",e); - // 这里应该记录日志或者进行一些错误处理 - return Collections.emptyList(); - } + List distributionSignforVOS; + try { + distributionSignforVOS = baseMapper.selectDistributionSignforPage(null, distributionSignforVO); + } catch (Exception e) { + log.error(">>> selectDistributionSignforPage", e); + // 这里应该记录日志或者进行一些错误处理 + return Collections.emptyList(); + } - if (Func.isNotEmpty(distributionSignforVOS)) { - List reservationIds = distributionSignforVOS.stream().map(DistributionSignforVO::getReservationId).collect(Collectors.toList()); - processReservationIds(distributionSignforVOS, reservationIds); - } + if (Func.isNotEmpty(distributionSignforVOS)) { + List reservationIds = distributionSignforVOS.stream().map(DistributionSignforVO::getReservationId).collect(Collectors.toList()); + processReservationIds(distributionSignforVOS, reservationIds); + } - List a = new ArrayList<>(); - distributionSignforVOS.forEach(d -> { - d.setDeliveryTypeName(getDeliveryTypeName(d.getDeliveryType())); + List a = new ArrayList<>(); + distributionSignforVOS.forEach(d -> { + d.setDeliveryTypeName(getDeliveryTypeName(d.getDeliveryType())); - DistributionSignforOwnExcel signforExcel = new DistributionSignforOwnExcel(); + DistributionSignforOwnExcel signforExcel = new DistributionSignforOwnExcel(); // BeanUtils.copyProperties(d, signforExcel); - signforExcel.setTrainNumber(d.getTrainNumber()); - signforExcel.setReservationCode(d.getReservationCode()); - signforExcel.setDeliveryDriverName(d.getDriverName()); - signforExcel.setDeliveryDriverPhone(d.getDriverPhone()); - signforExcel.setVehicleName(d.getVehicleName()); - signforExcel.setTaskTime(d.getTaskTime()); - signforExcel.setOrderCode(d.getStockArticleId()); - signforExcel.setDeliveryTypeName(d.getDeliveryTypeName()); - signforExcel.setSigningStatusName(d.getSigningStatusName()); - signforExcel.setSigningTime(d.getSigningTime()); - signforExcel.setDeliveryStatusName(d.getDeliveryStatusName()); - signforExcel.setDeliveryPhone(d.getDriverPhone()); - signforExcel.setLoadedNumber(d.getLoadedNumber()); - signforExcel.setReceivedQuantity(d.getReceivedQuantity()); - signforExcel.setReservationNum(d.getReservationNum()); - signforExcel.setDeliveryAddress(d.getDeliveryAddress()); - signforExcel.setWithoutScanning(d.getWithoutScanning()); - signforExcel.setLoadingTime(d.getSigningTime()); - signforExcel.setConsignee(d.getConsignee()); - signforExcel.setDeliveryPhone(d.getDeliveryPhone()); - - signforExcel.setDeliveryTypeName(d.getDeliveryTypeName()); - signforExcel.setSjsigningTime(d.getSjsigningTime()); - signforExcel.setSigneeName(d.getSigneeName()); - signforExcel.setSigningStatusName(d.getSigningStatus()); - signforExcel.setDeliveryStatusName(d.getSijiSigningStatus()); - signforExcel.setExamineUserName(d.getExamineUserName()); - signforExcel.setWarehouseName(d.getWarehouseName()); - signforExcel.setUnsigneds(d.getTotalNum() - d.getSigningNum()); - - - - a.add(signforExcel); - }); - - return a; + signforExcel.setTrainNumber(d.getTrainNumber()); + signforExcel.setReservationCode(d.getReservationCode()); + signforExcel.setDeliveryDriverName(d.getDriverName()); + signforExcel.setDeliveryDriverPhone(d.getDriverPhone()); + signforExcel.setVehicleName(d.getVehicleName()); + signforExcel.setTaskTime(d.getTaskTime()); + signforExcel.setOrderCode(d.getStockArticleId()); + signforExcel.setDeliveryTypeName(d.getDeliveryTypeName()); + signforExcel.setSigningStatusName(d.getSigningStatusName()); + signforExcel.setSigningTime(d.getSigningTime()); + signforExcel.setDeliveryStatusName(d.getDeliveryStatusName()); + signforExcel.setDeliveryPhone(d.getDriverPhone()); + signforExcel.setLoadedNumber(d.getLoadedNumber()); + signforExcel.setReceivedQuantity(d.getReceivedQuantity()); + signforExcel.setReservationNum(d.getReservationNum()); + signforExcel.setDeliveryAddress(d.getDeliveryAddress()); + signforExcel.setWithoutScanning(d.getWithoutScanning()); + signforExcel.setLoadingTime(d.getSigningTime()); + signforExcel.setConsignee(d.getConsignee()); + signforExcel.setDeliveryPhone(d.getDeliveryPhone()); + + signforExcel.setDeliveryTypeName(d.getDeliveryTypeName()); + signforExcel.setSjsigningTime(d.getSjsigningTime()); + signforExcel.setSigneeName(d.getSigneeName()); + signforExcel.setSigningStatusName(d.getSigningStatus()); + signforExcel.setDeliveryStatusName(d.getSijiSigningStatus()); + signforExcel.setExamineUserName(d.getExamineUserName()); + signforExcel.setWarehouseName(d.getWarehouseName()); + int unsigneds =d.getReservationNum() - d.getReceivedQuantity(); + signforExcel.setUnsigneds(unsigneds); + + a.add(signforExcel); + }); + return a; + } catch (Exception e) { + e.printStackTrace(); + } + return null; -// List distributionSignforList = baseMapper.exportDistributionSignforSigningOwn(distributionSignforVO); -// -// List list = new ArrayList<>(); -// distributionSignforList.forEach(d -> { -// DistributionSignforOwnExcel signforExcel = Func.copy(d, DistributionSignforOwnExcel.class); -// assert signforExcel != null; -// signforExcel.setLoadingTime(d.getLoadingTime()); -// signforExcel.setDeliveryDriverPhone(d.getDriverPhone()); -// signforExcel.setDeliveryDriverName(d.getDriverName()); -// signforExcel.setReservationNum(d.getTotalNum()); -// signforExcel.setLoadedNumber(d.getPackageLoadingNum() + d.getInventoryLoadingNum()); -// signforExcel.setReceivedQuantity(d.getPackageSigningNum() + d.getInventorySigningNum()); -// signforExcel.setDeliveryStatusName(d.getDeliveryStatusName()); -// signforExcel.setDeliveryPhone(d.getDeliveryPhone()); -// signforExcel.setWithoutScanning(d.getTotalNum() - (d.getPackageLoadingNum() + d.getInventoryLoadingNum())); -// signforExcel.setUnsigneds(d.getTotalNum() - (d.getPackageSigningNum() + d.getInventorySigningNum())); -// signforExcel.setConsignee(d.getConsignee()); -// list.add(signforExcel); -// }); -// return list; } @Override @@ -2532,7 +2510,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageLockIds = new ArrayList<>(); try { @@ -2773,10 +2750,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:"); if (Func.isNotEmpty(a)) { - assert a != null; - boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); + assert a != null; + boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag) { //正在操作，请稍后重试 throw new RuntimeException("该包件正在被操作,请稍后再试!!!"); @@ -3965,7 +3942,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds); - List reservationOrders = distributionReservationStockarticleService.list(Wrappers.query().lambda() .eq(DistributionReservationStockarticleEntity::getReservationId, distributionDeliveryList.getReservationId()) .in(DistributionReservationStockarticleEntity::getStockArticleId, orderIds) @@ -4105,6 +4081,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl customers) { for (SignPushDataContactDTO signPushDataUnitDTO : customers) { User user = bladeRedis.get(RedisKeyConstant.USER_NAME_PHONE_KEY + signPushDataUnitDTO.getSignUserId()); - log.info("buildNameAndPhone >>> 获取缓存的中的用户信息{}",user); + log.info("buildNameAndPhone >>> 获取缓存的中的用户信息{}", user); if (user == null) { R userT = userClient.userInfoById(signPushDataUnitDTO.getSignUserId()); if (userT.isSuccess()) { @@ -6721,13 +6696,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>用户名称:{}",user.getName()); + } else { + log.info("用户无电话号码且账号信息为空>>用户名称:{}", user.getName()); } } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java index be1b2f5cb..a129eb99c 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java @@ -119,7 +119,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { public IndexHandOrderDataVO handOrderData(IndexDTO indexDTO) { //增加缓存 BladeUser user = AuthUtil.getUser(); - String key = CacheNames.tenantKey(user.getTenantId(), user.getUserId() + "", "allocationData"); + String key = CacheNames.tenantKey(user.getTenantId(), user.getUserId() + "", "handOrderData"); IndexHandOrderDataVO indexHandOrderDataVO = bladeRedis.get(key); if (Objects.isNull(indexHandOrderDataVO)) {