From fe423bc1f8c9b4d94e2cc7dcdbf2821522550e8d Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 26 Sep 2024 09:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=AD=BE=E6=94=B6=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionSignforMapper.xml | 16 ++++++++-------- .../impl/DistributionSignforServiceImpl.java | 5 +++++ 2 files changed, 13 insertions(+), 8 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 29a344dd8..11bef398d 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 @@ -1931,7 +1931,7 @@ ) AS scannedNumber, (( SELECT - IFNUll( sum( loaded_nub ), 0 ) + IFNUll( sum( received_quantity ), 0 ) FROM logpm_distribution_loadscan WHERE @@ -1939,7 +1939,7 @@ AND is_deleted = 0 AND scan_status != 1 AND signfor_state = 2 - ) + ( SELECT IFNUll( sum( loaded_nub ), 0 ) FROM logpm_distribution_loadscaninvn WHERE delivery_id = lddl.id AND + ) + ( SELECT IFNUll( sum( received_quantity ), 0 ) FROM logpm_distribution_loadscaninvn WHERE delivery_id = lddl.id AND is_deleted = 0 AND scan_status != 1 AND signfor_state = 2) ) AS signforNumber, ( @@ -2067,7 +2067,7 @@ ) AS loadingNumber, (( SELECT - IFNUll( sum( loaded_nub ), 0 ) + IFNUll( sum( received_quantity ), 0 ) FROM logpm_distribution_loadscan WHERE @@ -2075,7 +2075,7 @@ AND is_deleted = 0 AND scan_status != 1 AND signfor_state = 2 - ) + ( SELECT IFNUll( sum( loaded_nub ), 0 ) FROM logpm_distribution_loadscaninvn WHERE delivery_id = lddl.id AND + ) + ( SELECT IFNUll( sum( received_quantity ), 0 ) FROM logpm_distribution_loadscaninvn WHERE delivery_id = lddl.id AND is_deleted = 0 AND scan_status != 1 AND signfor_state = 2 ) ) AS signforNumber, CASE lddl.delivery_status @@ -2128,8 +2128,8 @@ is_deleted = 0 AND scan_status != 1 ), 0 ) + IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted = 0 ), 0 ) AS loadingQuantity, - IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND - is_deleted = 0 AND scan_status != 1 AND signfor_state = 2), 0 ) + IFNULL(( SELECT SUM( loaded_nub ) FROM + IFNULL(( SELECT SUM( received_quantity ) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND + is_deleted = 0 AND scan_status != 1 AND signfor_state = 2), 0 ) + IFNULL(( SELECT SUM( receivedin_quantity ) FROM logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted = 0 AND signfor_state = 2 ), 0 ) AS signforQuantity, ( SELECT IFNULL( GROUP_CONCAT( stockup_area ), '无备货区' ) FROM logpm_distribution_stock WHERE reservation_id = @@ -2175,8 +2175,8 @@ is_deleted = 0 AND scan_status != 1 ), 0 ) + IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted = 0 ), 0 ) AS loadingQuantity, - IFNULL(( SELECT SUM( receivedin_quantity ) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND - is_deleted = 0 AND scan_status != 1 AND signfor_state = 2), 0 ) + IFNULL(( SELECT SUM( receivedin_quantity ) FROM + IFNULL(( SELECT SUM( received_quantity ) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND + is_deleted = 0 AND scan_status != 1 AND signfor_state = 2), 0 ) + IFNULL(( SELECT SUM( received_quantity ) FROM logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted = 0 AND signfor_state = 2 ), 0 ) AS signforQuantity, ( SELECT IFNULL( GROUP_CONCAT( stockup_area ), '无备货区' ) FROM logpm_distribution_stock WHERE 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 354df24e9..789db2ca3 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 @@ -5938,6 +5938,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl updatePackageLoadingData = new ArrayList<>(); List packageIds = new ArrayList<>(); for (DistributionLoadscanEntity packageLoadingDatum : packageLoadingData) { + if ((packageLoadingDatum.getLoadedNub() - packageLoadingDatum.getReceivedQuantity()) > 0){ + //存在装车和签收数量不一致，回退签收数量 + distributionSignforMapper.deductionSignforPacjageNum(packageLoadingDatum.getDeliveryId(),packageLoadingDatum.getReservationId(),packageLoadingDatum.getReceivedQuantity()); + } packageLoadingDatum.setReceivedQuantity(packageLoadingDatum.getLoadedNub()); packageLoadingDatum.setSignforType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getValue()); packageLoadingDatum.setOneClick(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getValue()); @@ -5961,6 +5965,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl