From a0799dd4c2c34090db544b7de4cff246512bd7b4 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 6 Jan 2024 07:26:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=95=86=E5=AE=B6=E7=AB=AF=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=202.=E6=BB=9E?= =?UTF-8?q?=E7=95=99=E5=90=8E=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E5=8C=85?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E9=A2=84=E7=BA=A6=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionParcelListMapper.xml | 2 +- .../distribution/mapper/DistributionStockArticleMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 2fdb62107..e443fba7a 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 @@ -153,7 +153,7 @@ left join logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.parce_list_id = ldpl.id and ldrp.packet_bar_status in (1,3) LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id - LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.type = 2 + LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.type = 2 and ldl.scan_status !=1 LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id ldpl.is_deleted = 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 616700a75..76cf09463 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -74,7 +74,7 @@ SELECT * from logpm_distribution_stock_article ldsa where ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = 1 and ldsa.reservation_status in ('10','20') and ldsa.order_status in ('10','20','30') - and ldsa.order_code = #{distributionStockArticleVO.orderCode} + and ldsa.order_code like concat(#{distributionStockArticleVO.orderCode},'%') and ldsa.stockup_status = #{distributionStockArticleVO.stockupStatus}