From 160f89065f3cb1f339a3f3e85526ce8f0959d4c3 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 16 Aug 2023 10:13:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E6=94=B6=E8=A3=85?= =?UTF-8?q?=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionSignforMapper.xml | 13 ++++++------- .../impl/DistributionSignforServiceImpl.java | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) 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 d63079c27..7f47e0ea6 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 @@ -691,11 +691,8 @@ SELECT distinct ldsa.order_code AS orderCode, ldrs.reservation_num AS reservationNum, - (SELECT COALESCE(COUNT(*), 0) - FROM logpm_distribution_loadscan ldl - WHERE ldl.order_id = ldsa.id - AND ldl.scan_status != 1 - AND ldl.signfor_state = 2) AS signforNub + (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl WHERE ldl.order_id = ldsa.id AND ldl.scan_status != 1 AND ldl.signfor_state = 2) AS signforNub, + (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl WHERE ldl.order_id = ldsa.id AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub FROM logpm_distribution_reservation ldr JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id @@ -731,7 +728,8 @@ FROM logpm_distribution_loadscan ldl WHERE ldl.order_id = ldsa.id AND ldl.scan_status != 1 - AND ldl.signfor_state = 2) AS signforNub + AND ldl.signfor_state = 2) AS signforNub, + (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl WHERE ldl.order_id = ldsa.id AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub FROM logpm_distribution_reservation ldr JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id @@ -761,7 +759,8 @@ FROM logpm_distribution_loadscan ldl WHERE ldl.order_id = ldsa.id AND ldl.scan_status != 1 - AND ldl.signfor_state = 2) AS signforNub + AND ldl.signfor_state = 2) AS signforNub, + (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl WHERE ldl.order_id = ldsa.id AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub FROM logpm_distribution_reservation ldr JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id 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 1a77351f1..86c9fff80 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 @@ -342,6 +342,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl getAppDeliveryorderListPage(IPage page, DistributionAppDeliveryListDTO distributionDeliveryList) { List selectord = baseMapper.selectord(page, distributionDeliveryList); + //1-未扫,2-部分扫,3-齐套 if (null !=distributionDeliveryList.getCompletecode()){ if (distributionDeliveryList.getCompletecode() ==2){ selectord = baseMapper.selectorda(page, distributionDeliveryList);