From 9c9b28ae3bbe7719774cd6d798f6fecbcb8e0fbd Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 13 May 2024 11:51:12 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E7=AD=BE=E6=94=B6=E8=AE=A2=E5=88=B6?=
 =?UTF-8?q?=E5=93=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionSignforMapper.xml       | 18 +++++++++---------
 .../impl/DistributionSignforServiceImpl.java   |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

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 9ac96eda4..a591ea966 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
@@ -806,23 +806,23 @@
     </select>
             <select id="selectAppDeliveryInventoryPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
                 SELECT
-                distinct ldsl.id id,
+                ldsl.id id,
                 ldsl.sku sku,
                 ldsl.cargo_number cargoNumber,
                 ldsl.description_goods descriptionGoods,
                 ldl.signfor_state signforState,
                 ldl.order_package_code orderPackageCode,
                 lbm.specification specification,
-                lbm.logpm_unit logpmUnit
+                lbm.logpm_unit logpmUnit,
+                if(ldl.id is not null,IF(ldl.signfor_state = 2,1,0),0) AS signforNub
                 FROM
-                logpm_distribution_reservation ldr
-                join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
-                join logpm_distribution_stock_list ldsl on ldsl.id =  ldrs.stocklist_id
-                LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
-                left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
+                logpm_dis_stock_list_detail AS ldsld
+                LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsld.stock_list_id = ldsl.id
+                LEFT JOIN logpm_distribution_loadscaninvn ldl ON ldsl.id = ldl.inventory_id AND ldsld.id = ldl.inventory_package_id
+                LEFT JOIN logpm_basicdata_material lbm ON ldsl.material_id = lbm.id
                 <where>
-                    ldr.is_deleted = 0
-                    AND ldr.id = #{param.reservationId}
+                    ldsld.is_deleted = 0
+                    AND ldsld.reservation_id = #{param.reservationId}
                 </where>
             </select>
             <select id="selectListbyink" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 675e4501a..653dc6d7f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -3889,7 +3889,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 
 		}
-
 		return orderVos;
 
 	}