From 28584220f829b578d2a2b87ab7fc76b59664acb2 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Apr 2024 17:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BB=93=E5=BA=93BUG=E4=BF=AE=E5=A4=8D=E3=80=81=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E7=BC=96=E8=BE=91=E8=AE=A2=E5=8D=95=E7=BC=96=E8=BE=91?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionParcelListMapper.xml | 6 ++- .../mapper/DistributionSignforMapper.java | 13 ++++++- .../mapper/DistributionSignforMapper.xml | 39 ++++++++++++++++++- .../ClerkCheckPushDataQueueHandler.java | 13 +++++-- .../service/impl/WarehouseServiceImpl.java | 1 + 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 6055799e7..86ff8bcc3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -1040,7 +1040,11 @@ FROM logpm_distribution_parcel_list AS ldpl WHERE - ldpl.order_package_reservation_status = 10 and ldpl.order_package_freeze_status = 10 AND ldpl.order_package_loading_status = 10 AND order_package_status IN (10,20) + ldpl.order_package_reservation_status = 10 + and ldpl.order_package_freeze_status = 10 + AND ldpl.order_package_loading_status = 10 + AND ldpl.conditions = 1 + AND order_package_status IN (10,20) and ldpl.stock_article_id = #{param.orderId} and ldpl.warehouse_id = #{warehouseId} and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index 34c6c6f8c..5b5a783a0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -274,7 +274,16 @@ public interface DistributionSignforMapper extends BaseMapper selectPushOldInventory(@Param("reservationId")Long reservationId, @Param("deliveryId")Long deliveryId); + List selectLoadingPushOldInventory(@Param("reservationId")Long reservationId, @Param("deliveryId")Long deliveryId); + + + /** + * 推送老系统库存品包件 + * @param reservationId + * @param deliveryId + * @return + */ + List selectSigningPushOldInventory(@Param("reservationId")Long reservationId, @Param("deliveryId")Long deliveryId); /** * 减少装车数 @@ -339,4 +348,6 @@ public interface DistributionSignforMapper extends BaseMapper> getByReservationIds(@Param("reservationIds") List longList); + + } 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 9d311b96b..ad2403b3b 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 @@ -1230,7 +1230,7 @@ AND ldl.is_deleted = 0 AND ldl.signfor_state = 2 - SELECT ldsl.id AS id, ldsl.warehouse_id AS warehouse_id, @@ -1240,6 +1240,43 @@ lddl.order_code AS orderSelfNum, ldsld.stock_package_code AS unitNo, ldl.signfor_state AS type, + ldl.create_time AS operateTime, + ldl.create_user AS administratorsId, + IF + ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading, + ldl.scan_time AS loading_time, + ldl.signing_time AS sign_time, + 1 AS is_out, + ldsl.quantity_stock AS num, + 3 AS goods_type, + ldl.received_quantity AS sign_num, + 4 AS broke_state + FROM + logpm_distribution_loadscaninvn AS ldl + LEFT JOIN logpm_distribution_delivery_list AS lddl ON ldl.delivery_id = lddl.id + AND lddl.is_deleted = 0 + LEFT JOIN logpm_dis_stock_list_detail AS ldsld ON ldsld.reservation_id = ldl.reservation_id + AND ldl.inventory_id = ldsld.stock_list_id + AND ldsld.is_deleted = 0 + LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsl.id = ldl.inventory_id + AND ldsl.is_deleted = 0 + WHERE + ldl.delivery_id = #{deliveryId} + AND ldl.reservation_id = #{reservationId} + AND ldl.scan_status != 1 + +