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 01/11] =?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)); } From c4c65fbf55d5a917b73f9a8387047cdb1acbee8c Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 28 Sep 2024 14:01:06 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E4=BB=B6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionDeliveryListServiceImpl.java | 11 ++++++----- .../service/impl/DistributionSignforServiceImpl.java | 10 +++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) 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 10c012615..9cd665bb8 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 @@ -10094,7 +10094,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl - r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && - r.getMallName().equals(stockArticleEntity.getMallName()) && - r.getId().equals(distrilbutionloadingscanDTO.getReservationId()) + r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) + && r.getMallName().equals(stockArticleEntity.getMallName()) + && r.getId().equals(distrilbutionloadingscanDTO.getReservationId()) ); if (flag) { List reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee()) @@ -10117,7 +10119,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); List loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.query().lambda().eq(DistributionLoadscaninvnEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscaninvnEntity::getScanState, LoadingStatusConstant.quxiao.getValue())); if (Func.isNotEmpty(loadscanEntityList)) { int packSignTotal = loadscanEntityList.stream().filter(l -> Func.equals(l.getSignforState(), LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum(); @@ -8216,8 +8219,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Sat, 28 Sep 2024 14:10:43 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E4=BB=B6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 9cd665bb8..9f603f5df 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 @@ -10094,9 +10094,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Sat, 28 Sep 2024 14:20:58 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 0d61eb3d4..5304c81e2 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 @@ -8218,6 +8218,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Sat, 28 Sep 2024 15:31:15 +0800 Subject: [PATCH 05/11] =?UTF-8?q?PDA=E7=AD=BE=E6=94=B6BUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 1 + .../impl/DistributionSignforServiceImpl.java | 61 ++++++------------- 2 files changed, 18 insertions(+), 44 deletions(-) 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 9f603f5df..ffeabd3f4 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 @@ -9998,6 +9998,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>当前车次:{},异常车次:{}", deliveryListEntity.getTrainNumber(), abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","))); return R.fail(code + "已在其他车次执行异常!!"); } - //判断具体的装车信息 } } List parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId()); @@ -3238,31 +3242,25 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() - .eq(DistributionDeliverySelfEntity::getIsMaster, ServiceConstant.IS_MASTER_YES) - .eq(DistributionDeliverySelfEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) - ); - } else { - DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper().lambda() - .eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())); - BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity); + if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading){ + return R.fail("当前操作需由司机完成"); } + BladeUser user = AuthUtil.getUser(); + Boolean driver = distributionDeliveryListService.judgeIsDriver(user); + //这里装车的数据需要进行补录 + DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity,user,driver); DistributionDeliveryListEntity listEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId()); if (Func.isEmpty(listEntity)) { log.error("##########配送计划异常：{}", listEntity); @@ -3346,13 +3339,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>> 签收推送报错", e); - // } - + distributionSignforMapper.autoDpdateSignfor(distributionReservationEntity.getId()); } else { //一个客户下出现重复包条码 log.error("############出现重复包条码：{}", collect); @@ -5400,7 +5373,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Sat, 28 Sep 2024 16:30:46 +0800 Subject: [PATCH 06/11] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionSignforMapper.java | 7 +++++ .../mapper/DistributionSignforMapper.xml | 4 +++ .../DistributionDeliveryListServiceImpl.java | 7 ++--- .../impl/DistributionSignforServiceImpl.java | 27 +++++++++++++------ .../DistributionStockArticleServiceImpl.java | 2 -- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index 08cf275f7..9d8cc30d7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -488,4 +488,11 @@ public interface DistributionSignforMapper extends BaseMapper SELECT received_quantity+receivedin_quantity FROM logpm_distribution_signfor WHERE reservation_id = #{reservationId} + 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 ffeabd3f4..d35581e08 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 @@ -9404,10 +9404,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + deliveryList.getTrainNumber() + ":orderPackageIds:"); if (!Objects.isNull(a)) { @@ -9424,7 +9420,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl().lambda() + .eq(DistributionDeliverySelfEntity::getIsMaster, ServiceConstant.IS_MASTER_YES) + .eq(DistributionDeliverySelfEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) + ); + } else { + DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper().lambda() + .eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())); + BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity); + distributionDeliverySelfEntity.setVehicleNub(distributionDeliveryTripartiteEntity.getVehicleNum()); + } DistributionDeliveryListEntity listEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId()); if (Func.isEmpty(listEntity)) { log.error("##########配送计划异常：{}", listEntity); @@ -7812,9 +7821,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0) { stockArticleEntity.setGenre(1); } From 37964afd8128ea23a272f04c634e794af256c543 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 28 Sep 2024 16:48:16 +0800 Subject: [PATCH 07/11] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/ModuleNameConstant.java | 2 +- .../java/com/logpm/warehouse/entity/TaskQuestEntity.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index d60420fe5..4708feb7c 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-pref"; /** * 工厂对接服务名称 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java index cc09d0576..b7c594305 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java @@ -67,6 +67,12 @@ public class TaskQuestEntity extends TenantEntity { */ @ApiModelProperty(value = "任务单号") private String questNum; + + /** + * 任务名称 + */ + @ApiModelProperty(value = "任务名称") + private String taskName; /** * 开始时间 */ From 6ea2baee92c90bb48ae7414b5a469605b2f31df4 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 28 Sep 2024 16:49:47 +0800 Subject: [PATCH 08/11] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/warehouse/entity/TaskQuestEntity.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java index b7c594305..cc09d0576 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java @@ -67,12 +67,6 @@ public class TaskQuestEntity extends TenantEntity { */ @ApiModelProperty(value = "任务单号") private String questNum; - - /** - * 任务名称 - */ - @ApiModelProperty(value = "任务名称") - private String taskName; /** * 开始时间 */ From eadcb12351fff533504329da0ee1f0f28d2779d1 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 28 Sep 2024 16:50:59 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E7=AD=BE=E6=94=B6BUG?= =?UTF-8?q?=E3=80=81=E5=90=8E=E5=8F=B0=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=99=90=E5=88=B6=E5=90=8E=E5=8F=B0=E7=AD=BE?= =?UTF-8?q?=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListController.java | 1 - .../impl/DistributionSignforServiceImpl.java | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 86b3f2cbf..4e1934e55 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -464,7 +464,6 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "PC签收包件") public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) { - try{ R r = distributionSignforService.signforPC(distrilbutionloadingscanDTO); long time = System.currentTimeMillis(); 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 69ab3817d..a74dff575 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 @@ -3175,9 +3175,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:"); + List 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)); @@ -3388,10 +3389,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Sat, 28 Sep 2024 17:02:40 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/ModuleNameConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 4708feb7c..d60420fe5 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-pref"; + public static final String DEVAUTH =""; /** * 工厂对接服务名称 From db78324c635151cc25b6b066259592f11e448e8c Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 28 Sep 2024 17:18:18 +0800 Subject: [PATCH 11/11] =?UTF-8?q?PC=E7=AD=BE=E6=94=B6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 77 ++++++++++++------- 1 file changed, 51 insertions(+), 26 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 a74dff575..eb0dd5e3c 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 @@ -905,6 +905,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailEntities = distributionReservationMapper.selectInventoryListByReservation(distrilbutionloadingscanDTO.getReservationId()); List jsonObjects = new ArrayList<>(); @@ -938,6 +943,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() .eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())); BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity); + distributionDeliverySelfEntity.setVehicleNub(distributionDeliveryTripartiteEntity.getVehicleNum()); } DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity(); @@ -979,7 +988,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId()); + DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfEntity(); + if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) { + distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(new QueryWrapper().lambda() + .eq(DistributionDeliverySelfEntity::getIsMaster, ServiceConstant.IS_MASTER_YES) + .eq(DistributionDeliverySelfEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) + ); + } else { + DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper().lambda() + .eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())); + BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity); + distributionDeliverySelfEntity.setVehicleNub(distributionDeliveryTripartiteEntity.getVehicleNum()); + } //在库数 int a = 0; //签收数 @@ -1454,19 +1474,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverPhone).collect(Collectors.joining(",")); - driverName = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverName).collect(Collectors.joining(",")); - vehicleNub = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getVehicleNub).collect(Collectors.joining(",")); - List collect = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getId).collect(Collectors.toList()); - loadingId = collect.get(0); - } else if ("2".equals(deliveryListEntity.getKind())) { - //外协 - } else { - log.error(method + "配送司机异常:{}", distrilbutionloadingscanDTO.getDeliveryId()); - return R.fail("请联系管理员"); + if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())){ + return R.fail("操作失败,存在未装车包件"); } a = distributionParcelNumberDTO.getHandQuantity() - reservationZeroPackageEntities.getQuantity(); b = distributionParcelNumberDTO.getSigninQuantity() + reservationZeroPackageEntities.getQuantity(); @@ -1474,9 +1483,24 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl