java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

批量签收数量维护

dist.1.3.0
汤建军 5 months ago
parent
172a753ff2
commit
fe423bc1f8
2 changed files with 13 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  2. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

16
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
Unescape View File

@ -1931,7 +1931,7 @@
) AS scannedNumber, ) AS scannedNumber,
(( ((
SELECT SELECT
IFNUll( sum( loaded_nub ), 0 ) IFNUll( sum( received_quantity ), 0 )
FROM FROM
logpm_distribution_loadscan logpm_distribution_loadscan
WHERE WHERE
@ -1939,7 +1939,7 @@
AND is_deleted = 0 AND is_deleted = 0
AND scan_status != 1 AND scan_status != 1
AND signfor_state = 2 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) is_deleted = 0 AND scan_status != 1 AND signfor_state = 2)
) AS signforNumber, ) AS signforNumber,
( (
@ -2067,7 +2067,7 @@
) AS loadingNumber, ) AS loadingNumber,
(( ((
SELECT SELECT
IFNUll( sum( loaded_nub ), 0 ) IFNUll( sum( received_quantity ), 0 )
FROM FROM
logpm_distribution_loadscan logpm_distribution_loadscan
WHERE WHERE
@ -2075,7 +2075,7 @@
AND is_deleted = 0 AND is_deleted = 0
AND scan_status != 1 AND scan_status != 1
AND signfor_state = 2 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 ) is_deleted = 0 AND scan_status != 1 AND signfor_state = 2 )
) AS signforNumber, ) AS signforNumber,
CASE lddl.delivery_status CASE lddl.delivery_status
@ -2128,8 +2128,8 @@
is_deleted = 0 AND scan_status != 1 ), 0 ) + IFNULL(( SELECT SUM( loaded_nub ) FROM 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 = logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted =
0 ), 0 ) AS loadingQuantity, 0 ), 0 ) AS loadingQuantity,
IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND 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( loaded_nub ) FROM 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 = logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted =
0 AND signfor_state = 2 ), 0 ) AS signforQuantity, 0 AND signfor_state = 2 ), 0 ) AS signforQuantity,
( SELECT IFNULL( GROUP_CONCAT( stockup_area ), '无备货区' ) FROM logpm_distribution_stock WHERE reservation_id = ( 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 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 = logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted =
0 ), 0 ) AS loadingQuantity, 0 ), 0 ) AS loadingQuantity,
IFNULL(( SELECT SUM( receivedin_quantity ) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND 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 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 = logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted =
0 AND signfor_state = 2 ), 0 ) AS signforQuantity, 0 AND signfor_state = 2 ), 0 ) AS signforQuantity,
( SELECT IFNULL( GROUP_CONCAT( stockup_area ), '无备货区' ) FROM logpm_distribution_stock WHERE reservation_id = ( SELECT IFNULL( GROUP_CONCAT( stockup_area ), '无备货区' ) FROM logpm_distribution_stock WHERE reservation_id =

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -5938,6 +5938,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
List<DistributionLoadscanEntity> updatePackageLoadingData = new ArrayList<>(); List<DistributionLoadscanEntity> updatePackageLoadingData = new ArrayList<>();
List<Long> packageIds = new ArrayList<>(); List<Long> packageIds = new ArrayList<>();
for (DistributionLoadscanEntity packageLoadingDatum : packageLoadingData) { for (DistributionLoadscanEntity packageLoadingDatum : packageLoadingData) {
if ((packageLoadingDatum.getLoadedNub() - packageLoadingDatum.getReceivedQuantity()) > 0){
//存在装车和签收数量不一致，回退签收数量
distributionSignforMapper.deductionSignforPacjageNum(packageLoadingDatum.getDeliveryId(),packageLoadingDatum.getReservationId(),packageLoadingDatum.getReceivedQuantity());
}
packageLoadingDatum.setReceivedQuantity(packageLoadingDatum.getLoadedNub()); packageLoadingDatum.setReceivedQuantity(packageLoadingDatum.getLoadedNub());
packageLoadingDatum.setSignforType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getValue()); packageLoadingDatum.setSignforType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getValue());
packageLoadingDatum.setOneClick(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getValue()); packageLoadingDatum.setOneClick(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getValue());
@ -5961,6 +5965,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
); );
distributionParcelNumberEntity.setSigninQuantity(distributionParcelNumberEntity.getSigninQuantity() + packageLoadingDatum.getReceivedQuantity()); distributionParcelNumberEntity.setSigninQuantity(distributionParcelNumberEntity.getSigninQuantity() + packageLoadingDatum.getReceivedQuantity());
distributionParcelNumberService.updateById(distributionParcelNumberEntity); distributionParcelNumberService.updateById(distributionParcelNumberEntity);
//需要对目前零担已签数据进行回退
} }
} }
if (!updatePackageLoadingData.isEmpty()) { if (!updatePackageLoadingData.isEmpty()) {

Write Preview
Loading…
Cancel
Save