From 1ceb456d6a75e7aa4ea4fd6410f11888fbe456d5 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 1 Dec 2023 11:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7SQL=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     | 4 ++--
 .../logpm/distribution/mapper/DistributionSignforMapper.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 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 cf65074d3..dabf37eb0 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
@@ -298,7 +298,7 @@
     </select>
 
     <select id="selectStockupStockListNew" resultType="com.logpm.distribution.vo.DistributionStockupStockListVO">
-        SELECT
+        SELECT DISTINCT
 <!--        ldslNew.id AS stockListId,-->
         ldslNew.sku AS sku,
         ldslNew.cargo_number AS cargoNumber,
@@ -307,7 +307,7 @@
         ldslNew.cargo_unit AS cargoUnit,
         ldslNew.tray_name AS trayName,
         ldslNew.unpack AS unpack,
-        ldslNew.source_type AS sourceType,
+<!--        ldslNew.source_type AS sourceType,-->
 <!--        count(ldss.id) AS realNum,-->
         (SELECT count(*) FROM logpm_distribution_stock AS lds WHERE lds.stock_list_id = t.id AND lds.is_deleted = 0) AS realNum,
 <!--        t.deliveryDetailsId AS deliveryDetailsId,-->
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 39960912f..3544b6251 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
@@ -831,7 +831,7 @@
                 ldsl.cargo_number cargoNumber,
                 ldsl.description_goods descriptionGoods,
                 ldl.signfor_state signforState,
-                ldl.order_package_code coding,
+                ldl.order_package_code orderPackageCode,
                 lbm.specification specification,
                 lbm.logpm_unit logpmUnit
                 FROM