From ddd606e4ac2087f56940aaf3f615fa39dc4a8c9a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 28 Sep 2024 13:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 76 +++++++++---------- 1 file changed, 34 insertions(+), 42 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 81c999756..52b055772 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 @@ -3806,40 +3806,32 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() - .eq(DistributionLoadscanAbnormalEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) - .eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, distrilbutionloadingscanDTO.getDeliveryId()) - .eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode()) - ); - if (Func.isEmpty(list)) { - DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity = new DistributionLoadscanAbnormalEntity(); - distributionLoadscanAbnormalEntity.setAuditingStatus(LoadingAbnormalAuditingStatusConstant.daishenhe.getValue()); - distributionLoadscanAbnormalEntity.setStockArticleId(parcelListEntity.getStockArticleId()); - distributionLoadscanAbnormalEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber()); - distributionLoadscanAbnormalEntity.setDriverName(deliverySelfEntity.getDriverName()); - distributionLoadscanAbnormalEntity.setDriverId(Long.parseLong(deliverySelfEntity.getDriverId())); - distributionLoadscanAbnormalEntity.setDriverPhone(deliverySelfEntity.getDriverPhone()); - distributionLoadscanAbnormalEntity.setDeliveryListId(distributionDeliveryListEntity.getId()); - distributionLoadscanAbnormalEntity.setReservationId(reservationEntity.getId()); - distributionLoadscanAbnormalEntity.setDeliveryType(distributionDeliveryListEntity.getType()); - distributionLoadscanAbnormalEntity.setScanUser(user.getNickName()); - distributionLoadscanAbnormalEntity.setScanTime(new Date()); - distributionLoadscanAbnormalEntity.setLoadingQuantity(parcelListEntity.getQuantity()); - distributionLoadscanAbnormalEntity.setPackageCode(parcelListEntity.getOrderPackageCode()); - distributionLoadscanAbnormalEntity.setPackageId(parcelListEntity.getId()); - distributionLoadscanAbnormalEntity.setLoadingId(loadingId); - distributionLoadscanAbnormalEntity.setAbnormalType(LoadingAbnormalTypeConstant.qianshouyichang.getValue()); - distributionLoadscanAbnormalEntity.setGoodsType(1); - distributionLoadscanAbnormalEntity.setWarehouseId(myCurrentWarehouse.getId()); - distributionLoadscanAbnormalEntity.setWarehouseName(myCurrentWarehouse.getName()); - distributionLoadscanAbnormalEntity.setGoodsType(1); - distributionLoadscanAbnormalEntity.setLoadingId(loadingId); - distributionLoadscanAbnormalEntity.setVehicleId(Long.parseLong(deliverySelfEntity.getVehicleId())); - distributionLoadscanAbnormalEntity.setVehicleName(deliverySelfEntity.getVehicleNub()); - distributionLoadscanAbnormalEntity.setLoadingId(loadingId); - distributionLoadscanAbnormalService.save(distributionLoadscanAbnormalEntity); - } + DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity = new DistributionLoadscanAbnormalEntity(); + distributionLoadscanAbnormalEntity.setAuditingStatus(LoadingAbnormalAuditingStatusConstant.daishenhe.getValue()); + distributionLoadscanAbnormalEntity.setStockArticleId(parcelListEntity.getStockArticleId()); + distributionLoadscanAbnormalEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber()); + distributionLoadscanAbnormalEntity.setDriverName(deliverySelfEntity.getDriverName()); + distributionLoadscanAbnormalEntity.setDriverId(Long.parseLong(deliverySelfEntity.getDriverId())); + distributionLoadscanAbnormalEntity.setDriverPhone(deliverySelfEntity.getDriverPhone()); + distributionLoadscanAbnormalEntity.setDeliveryListId(distributionDeliveryListEntity.getId()); + distributionLoadscanAbnormalEntity.setReservationId(reservationEntity.getId()); + distributionLoadscanAbnormalEntity.setDeliveryType(distributionDeliveryListEntity.getType()); + distributionLoadscanAbnormalEntity.setScanUser(user.getNickName()); + distributionLoadscanAbnormalEntity.setScanTime(new Date()); + distributionLoadscanAbnormalEntity.setLoadingQuantity(parcelListEntity.getQuantity()); + distributionLoadscanAbnormalEntity.setPackageCode(parcelListEntity.getOrderPackageCode()); + distributionLoadscanAbnormalEntity.setPackageId(parcelListEntity.getId()); + distributionLoadscanAbnormalEntity.setLoadingId(loadingId); + distributionLoadscanAbnormalEntity.setAbnormalType(LoadingAbnormalTypeConstant.qianshouyichang.getValue()); + distributionLoadscanAbnormalEntity.setGoodsType(1); + distributionLoadscanAbnormalEntity.setWarehouseId(myCurrentWarehouse.getId()); + distributionLoadscanAbnormalEntity.setWarehouseName(myCurrentWarehouse.getName()); + distributionLoadscanAbnormalEntity.setGoodsType(1); + distributionLoadscanAbnormalEntity.setLoadingId(loadingId); + distributionLoadscanAbnormalEntity.setVehicleId(Long.parseLong(deliverySelfEntity.getVehicleId())); + distributionLoadscanAbnormalEntity.setVehicleName(deliverySelfEntity.getVehicleNub()); + distributionLoadscanAbnormalEntity.setLoadingId(loadingId); + distributionLoadscanAbnormalService.save(distributionLoadscanAbnormalEntity); //修改对应的签收为可审核 DistributionSignforEntity signforEntity = distributionSignforMapper.getByReservationId(reservationEntity.getId()); signforEntity.setIsHaveAbnormalPackage(2); @@ -7718,9 +7710,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl pushList = new ArrayList<>(); List pushInventoryList = new ArrayList<>(); //配置项 - DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity,user,distributionDeliveryListService.judgeIsDriver(user)); - if (Objects.isNull(distributionDeliverySelfEntity)){ - return Resp.scanFail("当前操作人无此包件签收权限!!!","当前操作人无此包件签收权限!!!"); + DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity, user, distributionDeliveryListService.judgeIsDriver(user)); + if (Objects.isNull(distributionDeliverySelfEntity)) { + return Resp.scanFail("当前操作人无此包件签收权限!!!", "当前操作人无此包件签收权限!!!"); } switch (type) { case 1: @@ -7779,7 +7771,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>user:{}",user.getNickName()); - log.info("driver>>>>>>>>>>>>>user:{}",driver); + log.info("username>>>>>>>>>>>>>user:{}", user.getNickName()); + log.info("driver>>>>>>>>>>>>>user:{}", driver); if (deliveryListEntity.getKind().equals("1")) { @@ -8840,7 +8832,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>:{}",deliverySelfEntity.getDriverName()); + log.info("driverName>>>>>>>>>>>>>:{}", deliverySelfEntity.getDriverName()); if (Objects.isNull(deliverySelfEntity)) { @@ -8910,7 +8902,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>:{}",user.getNickName()); + log.info("driverName>>>>>>>>>>>>>:{}", user.getNickName()); signforEntity.setSigneeId(user.getUserId()); return R.data(this.updateById(signforEntity)); }