From 257870c9bb1a1289ac0fe9f65a865dd67134841a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 18 Mar 2025 17:40:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AD=BE=E6=94=B6=E8=AE=B0=E5=BD=95BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= 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 6bc6d7efe..7886fba9f 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 @@ -6496,6 +6496,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionLoadscanEntity::getPackageId, p.getId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); if (Func.isNotEmpty(distributionLoadscanEntity)) { //该包件存在扫描记录 From a74f8f98fbc756dd8fd53780b223db60b2d488de Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 18 Mar 2025 17:49:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E7=8E=87=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改配送签收率分组条件 --- .../report/service/impl/QualityDispatchNumberServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java index 6d98df6c3..935229cc3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java @@ -171,6 +171,10 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe List warehouseEntities = warehouseClient.getMyWarehouseList(); query.setWarehouseName(warehouseEntities.stream().map(BasicdataWarehouseEntity::getName).collect(Collectors.joining(","))); } + } else { + if ("全部".equals(query.getWarehouseName())) { + query.setWarehouseName(""); + } } List list = numberMapper.task(page, query); // 查询异常数