From 0384a842410afac8c9be24295e0be4cee2fe1b10 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 11 Jul 2024 10:22:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=BB=9E=E7=95=99=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionDeliveryListMapper.xml | 2 ++ .../service/impl/DistributionDeliveryListServiceImpl.java | 3 +++ .../logpm/warehouse/mapper/WarehouseRetentionScanMapper.xml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 1f6ec2c34..f0a763a7d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -2027,6 +2027,8 @@ ldpl.quantity AS retentionQuantity, 1 AS conditions, ldpl.waybill_number AS waybillNumber, + ldpl.material_name AS materialName, + ldpl.material_code AS materialNumber, ldpl.waybill_id AS waybillId, ldpl.order_package_status AS orderPackageStatus, ldpl.warehouse_id AS warehouseId, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 7d57ee7fa..d8b12076e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -6009,6 +6009,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl - select * from logpm_warehouse_retention_scan where is_deleted = 0 + select * from logpm_warehouse_retention_scan where is_deleted = 0 ORDER BY create_time DESC From 5d8dab091716d0525639d0ccbeda67c325e9479c Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 11 Jul 2024 11:26:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E5=A4=87?= =?UTF-8?q?=E8=B4=A7=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionReservationMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 2cc380f28..6b60e0c80 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -351,7 +351,10 @@ (SELECT SUM(aldrs.reality_num) FROM logpm_distribution_reservation_stocklist AS aldrs WHERE aldrs.reservation_id = #{reservationId} AND aldrs.stock_list_status != 2 AND FIND_IN_SET(aldrs.stocklist_id,t.aaa)) AS realNum, (SELECT SUM(newldrs.reservation_num) FROM logpm_distribution_reservation_stocklist AS newldrs WHERE newldrs.reservation_id = #{reservationId} ANd newldrs.stock_list_status != 2 AND FIND_IN_SET(newldrs.stocklist_id,t.aaa)) AS planNum, - concat(ifnull(t1.allocation_ids,''),if(t1.allocation_ids is not null,',',''), ifnull(t2.allocation_ids,'')) allocations + CASE ldslNew.source_type + WHEN 1 THEN t1.allocation_ids + ELSE t2.allocation_ids + END allocations FROM ( SELECT From b80e7caa562766c6a0aeb38ea4345d2e9cdd1cd0 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 11 Jul 2024 12:26:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/service/impl/InComingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index aac2f069d..f4f6dfd09 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -327,7 +327,7 @@ public class InComingServiceImpl implements IInComingService { map.put("trayCode", trayCode); map.put("warehouseId", warehouseId); map.put("orderPackageCode", packageCode); - warehouseTrayTypeClient.orderScanOrderPackageCode(map); + warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map); } }); }