From e27f9b00f9433a2d1970f3936c2ddeaf26bb54a7 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 20 Jun 2024 16:39:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AD=BE=E6=94=B6PDA=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListController.java | 4 ++-- .../mapper/DistributionSignforMapper.xml | 1 + .../IDistributionDeliveryListService.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 20 ++++--------------- 4 files changed, 8 insertions(+), 19 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 8b848b7f0..5ff2508e2 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 @@ -423,8 +423,8 @@ public class DistributionDeliveryListController extends BladeController { @GetMapping("/judgmentOrderRemove") @ApiOperationSupport(order = 2) @ApiOperation(value = "判断是否可以在商配计划中移除", notes = "customArgs") - public R judgmentOrderRemove(@RequestParam Long deliveryId,@RequestParam Long orderId) { - boolean result = distributionDeliveryListService.judgmentOrderRemove(deliveryId,orderId); + public R judgmentOrderRemove(@RequestParam Long deliveryId,@RequestParam String orderIds) { + boolean result = distributionDeliveryListService.judgmentOrderRemove(deliveryId,orderIds); return R.data(result); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 8eb6112b0..9084228b8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -733,6 +733,7 @@ logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id WHERE lds.is_deleted = 0 AND lds.delivery_id = #{id} + GROUP BY lds.reservation_id From 9b55c487221c22ef07df6be143a6b8e1ba6bfd61 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 20 Jun 2024 17:16:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=94=AF=E6=8C=81=E6=9C=80=E5=90=8E=E7=8E=AF?= =?UTF-8?q?=E8=8A=82=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=AD=90=E3=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=8D=E6=A0=B8=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 9aeed4732..219890ef3 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 @@ -2407,6 +2407,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() + .eq(DistributionSignforEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) + ); + if (Objects.isNull(signforEntity)){ + //查询签收信息错误 + log.error("签收扫描查询签收表信息错误reservationId:{}",distrilbutionloadingscanDTO.getReservationId()); + return R.fail(403, "配送任务错误"); + } + if (SignforStatusConstant.yiqianshou.getValue().equals(signforEntity.getSigningStatus())){ + return Resp.scanFail("此任务已完成复核", "此任务已完成复核"); + } + + + List packageLockIds = new ArrayList<>(); try { From e92ac0bbef53ca7eb10f54519cc381484a6e4413 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 20 Jun 2024 17:35:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BC=96=E7=A0=81BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/basicdata/mapper/BasicdataClientMapper.java | 2 +- .../java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml | 2 +- .../basicdata/service/impl/BasicdataClientServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java index 19b326ba1..75c5912aa 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java @@ -75,6 +75,6 @@ public interface BasicdataClientMapper extends BaseMapper * 查询规则生成的客户编码列表 * @return */ - List getFinallyClientCode(); + List getFinallyClientCode(@Param("tenantCode")String tenantCode); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml index c23861cef..936756058 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml @@ -169,7 +169,7 @@ DESC diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index 704f58530..9d4f442b4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -688,7 +688,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl str = baseMapper.getFinallyClientCode(); + List str = baseMapper.getFinallyClientCode(tenantCode); if(!str.isEmpty()){ finaClientCode = str.get(0); }else{