From 151379b85cd63ef6eefb2e61aa3b4223ca1a0c9b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 8 Mar 2024 21:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BB=BB=E5=8A=A1=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionReservationMapper.xml | 2 +- .../distribution/mapper/DistributionStockArticleMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 52beab8bf..94d33b19b 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 @@ -1712,7 +1712,7 @@ ldpl.order_package_reservation_status AS orderPackageReservationStatusName, ldrzp.quantity AS reservationNum, IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS loadingNum, - ldrzp.quantity = IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS AS signingNum , + ldrzp.quantity = IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS signingNum , CASE IF(ldl.loaded_nub is null,0,ldl.loaded_nub) WHEN 0 THEN '待装车' ELSE IF(ldl.loaded_nub = ldrzp.quantity,'已装车','部分装车') 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 88cbb17d0..92e6ec4c3 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 @@ -616,7 +616,8 @@ ldsa.order_status in ('10','20','30','70') and ldsa.reservation_status in ('10','20') - AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0 AND ldsa.hand_quantity > 0 + + AND ldsa.hand_quantity > 0 and ldsa.warehouse_id = #{par.warehouseId}