From 3831bb03aceeecbf41669bd5330202174101f4a5 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 9 Jul 2024 20:52:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=95=B0=E9=87=8FBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionDeliveryListMapper.xml | 2 +- .../impl/DistributionAsyncServiceImpl.java | 48 ++++--------------- .../impl/DistributionSignforServiceImpl.java | 10 +++- .../WarehouseRetentionRecordServiceImpl.java | 1 + 4 files changed, 19 insertions(+), 42 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 4e782b7e1..1f6ec2c34 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -1622,7 +1622,7 @@ INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id ldrp.packet_bar_status != 2 - + and lds.delivery_id = #{deliveryListId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 0fd611e2e..8d98f5082 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -16,7 +15,6 @@ import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; -import com.logpm.business.entity.BusinessPreOrderEntity; import com.logpm.distribution.dto.DistributionLoadingNumDTO; import com.logpm.distribution.dto.DistributionParcelNumberDTO; import com.logpm.distribution.dto.DistributionStockArticleDTO; @@ -25,28 +23,9 @@ import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.dto.app.StockupZeroDTO; import com.logpm.distribution.entity.*; -import com.logpm.distribution.mapper.DistributionBillLadingScanMapper; -import com.logpm.distribution.mapper.DistributionDeliveryDetailsMapper; -import com.logpm.distribution.mapper.DistributionDeliveryListMapper; -import com.logpm.distribution.mapper.DistributionLoadscanMapper; -import com.logpm.distribution.mapper.DistributionLoadscaninvnMapper; -import com.logpm.distribution.mapper.DistributionParcelListMapper; -import com.logpm.distribution.mapper.DistributionReservationMapper; -import com.logpm.distribution.mapper.DistributionReservationPackageMapper; -import com.logpm.distribution.mapper.DistributionReservationStockarticleMapper; -import com.logpm.distribution.mapper.DistributionReservationStocklistMapper; -import com.logpm.distribution.mapper.DistributionSignforMapper; -import com.logpm.distribution.mapper.DistributionStockListMapper; -import com.logpm.distribution.mapper.DistributionStockMapper; -import com.logpm.distribution.mapper.DistributionStockupInfoMapper; -import com.logpm.distribution.mapper.DistributionStockupMapper; -import com.logpm.distribution.mapper.DistrilbutionBillLadingMapper; +import com.logpm.distribution.mapper.*; import com.logpm.distribution.service.*; -import com.logpm.distribution.vo.DistributionParcelNumberVO; -import com.logpm.distribution.vo.DistributionSignPrintVO; -import com.logpm.distribution.vo.DistributionStockPackageVO; -import com.logpm.distribution.vo.DistributionStockupSelfVO; -import com.logpm.distribution.vo.DistrilbutionBillStockVO; +import com.logpm.distribution.vo.*; import com.logpm.factory.comfac.dto.OrderStatusDTO; import com.logpm.factory.mt.dto.MtReceiveContentDTO; import com.logpm.factory.mt.dto.MtReceiveDTO; @@ -58,11 +37,11 @@ import com.logpm.factorydata.util.FactoryDataMessageSender; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.factorydata.vo.PushData; import com.logpm.trunkline.dto.AddWaybillTrackDTO; -import com.logpm.trunkline.feign.*; +import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; +import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import com.logpm.warehouse.feign.IWarehouseWaybillClient; -import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.annotations.ChangeAsync; @@ -84,24 +63,14 @@ import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusCon import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant; -import org.springblade.common.constant.reservation.ReservationInventoryLoadingStatusConstant; -import org.springblade.common.constant.reservation.ReservationInventorySigningStatusConstant; -import org.springblade.common.constant.reservation.ReservationInventoryStatusConstant; -import org.springblade.common.constant.reservation.ReservationLoadingStatusConstant; -import org.springblade.common.constant.reservation.ReservationOrderStatusConstant; -import org.springblade.common.constant.reservation.ReservationPackageStatusConstant; -import org.springblade.common.constant.reservation.ReservationSigningStatusConstant; -import org.springblade.common.constant.reservation.ReservationStockupStatusConstant; +import org.springblade.common.constant.reservation.*; import org.springblade.common.constant.signing.SignforStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.constant.stockup.StockupTypeConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.system.entity.Tenant; import org.springblade.system.feign.ISysClient; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; @@ -154,7 +123,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { private final IDistrilbutionBillPackageService billPackageService; private final IDistributionReservationZeroPackageService zeroPackageService; - private final DistributionSignforMapper distributionSignforService; private final ITrunklineWaybillTrackClient trunklineWaybillTrackClient; private final IWarehouseWaybillClient waybillClient; @@ -1578,7 +1546,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { // todo 查询签收信息 - DistributionSignforEntity distributionSignfor = distributionSignforService.getByReservationId(distributionReservationStockarticleEntity.getReservationId()); + DistributionSignforEntity distributionSignfor = distributionSignforMapper.getByReservationId(distributionReservationStockarticleEntity.getReservationId()); OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode()); //单号 orderStatusDTO.setUsername(distributionSignfor.getSigneeName()); //操作人名称 @@ -2209,7 +2177,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } distributionReservationMapper.updateById(distributionReservationEntity); if (distributionReservationEntity.getReservationNum() == 0 && distributionReservationEntity.getReservationStockListNum() == 0) { - distributionReservationMapper.deleteById(distributionReservationEntity); + distributionReservationEntity.setIsDeleted(1); + distributionReservationEntity.setReservationStatus(ReservationStatusConstant.yiquexiao.getValue()); + distributionReservationMapper.updateById(distributionReservationEntity); } } } 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 a07bb70ca..4d2c5bdf5 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 @@ -890,9 +890,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda().eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId())).intValue(); + Integer lad = distributionLoadscanMapper.selectCount(new QueryWrapper().lambda() + .eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())) + .intValue(); - Integer nad = distributionLoadscaninvnMapper.selectCount(new QueryWrapper().lambda().eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId())).intValue(); + Integer nad = distributionLoadscaninvnMapper.selectCount(new QueryWrapper().lambda() + .eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId()) + .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())) + .intValue(); signforEntity.setLoadedNumber(lad); signforEntity.setLoadedinNumber(nad); //统计客户签收数 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java index a0ac34c7f..aa54d9b3c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java @@ -197,6 +197,7 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl Date: Wed, 10 Jul 2024 01:38:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99=202=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98=E7=88=86?= =?UTF-8?q?=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)) { From 6bfa73a4cbff36c536602faedfdd1951779c1789 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 10 Jul 2024 09:59:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E9=85=8D=E9=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=88=A4=E7=A9=BA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DistributionParcelListClient.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index b4d323274..f0d9e8ea2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.feign; +import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -437,11 +438,19 @@ public class DistributionParcelListClient implements IDistributionParcelListClie @Override public List findListByOrderPackageCodeList(FindParamterDTO findParamterDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("order_package_code", findParamterDTO.getOrderPackageCodeList()) - .eq("warehouse_id", findParamterDTO.getWarehouseId()); + List orderPackageCodeList = findParamterDTO.getOrderPackageCodeList(); + if(CollUtil.isNotEmpty(orderPackageCodeList)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("order_package_code", findParamterDTO.getOrderPackageCodeList()) + .eq("warehouse_id", findParamterDTO.getWarehouseId()); + return distributionParcelListService.list(queryWrapper); + }else{ + log.info("############findListByOrderPackageCodeList: 当前包件信息为空 orderPackageCodeList={}",orderPackageCodeList); + return null; + } + + - return distributionParcelListService.list(queryWrapper); } @Override