From ba3288e3864b930676c81ce6b9cb72576c5f865d Mon Sep 17 00:00:00 2001
From: Diss <1157651603@qq.com>
Date: Thu, 11 Jan 2024 10:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=A2=84=E7=BA=A6=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98=E5=93=81=E8=BF=99?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B4=A7=E4=BD=8D=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockListMapper.xml    | 145 +++++++++---------
 1 file changed, 74 insertions(+), 71 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 6308e1255..712a952a5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -389,102 +389,105 @@
     </select>
     <select id="selectAllStockList" resultType="com.logpm.distribution.vo.DistributionStockListVO">
        SELECT
-            tenant_id,
-            id,
-            create_user,
-            create_time,
-            update_user,
-            update_time,
-            status,
-            is_deleted,
-            create_dept,
-            reserve1,
-            reserve2,
-            reserve3,
-            reserve4,
-            reserve5,
-            order_code,
-            incoming_batch,
-            service_number,
-            material_id,
-            description_goods,
-            cargo_number,
-            cargo_norms,
-            cargo_unit,
-            warehouse_id,
-            warehouse_name,
-            storage_location,
-            mall_id,
-            mall_code,
-            mall_name,
-            quantity_stock,
-            store_id,
-            store_code,
-            store_name,
-            quantity_occupied,
-            outbound_quantity,
-            despatch,
-            stock_article_id,
-            factory,
-            category,
-<!--            unpack,-->
-            parcel_list_id,
-            shopping_mall,
-            market_id,
-            market_name,
-            market_code,
-            stock_list_code,
-            service_type,
-            pid,
-            brand_name,
-            brand_id,
-            warehousing_time,
-            unpacking_quantity,
-            license_plate,
-            tray_id,
-            tray_name,
-            sku,
-            grounding_time,
-            unpack
+        ldsl.tenant_id,
+        ldsl.id,
+        ldsl.create_user,
+        ldsl.create_time,
+        ldsl.update_user,
+        ldsl.update_time,
+        ldsl.status,
+        ldsl.is_deleted,
+        ldsl.create_dept,
+        ldsl.reserve1,
+        ldsl.reserve2,
+        ldsl.reserve3,
+        ldsl.reserve4,
+        ldsl.reserve5,
+        ldsl.order_code,
+        ldsl.incoming_batch,
+        ldsl.service_number,
+        ldsl.material_id,
+        ldsl.description_goods,
+        ldsl.cargo_number,
+        ldsl.cargo_norms,
+        ldsl.cargo_unit,
+        ldsl.warehouse_id,
+        ldsl.warehouse_name,
+        ldsl.storage_location,
+        ldsl.mall_id,
+        ldsl.mall_code,
+        ldsl.mall_name,
+        ldsl.quantity_stock,
+        ldsl.store_id,
+        ldsl.store_code,
+        ldsl.store_name,
+        ldsl.quantity_occupied,
+        ldsl.outbound_quantity,
+        ldsl.despatch,
+        ldsl.stock_article_id,
+        ldsl.factory,
+        ldsl.category,
+        -- ldsl.unpack,
+        ldsl.parcel_list_id,
+        ldsl.shopping_mall,
+        ldsl.market_id,
+        ldsl.market_name,
+        ldsl.market_code,
+        ldsl.stock_list_code,
+        ldsl.service_type,
+        ldsl.pid,
+        ldsl.brand_name,
+        ldsl.brand_id,
+        ldsl.warehousing_time,
+        ldsl.unpacking_quantity,
+        ldsl.license_plate,
+        ldsl.tray_id,
+        ldsl.tray_name,
+        ldsl.sku,
+        ldsl.grounding_time,
+        ldsl.unpack,
+        lwug.position_code
             FROM
-            logpm_distribution_stock_list
+            logpm_distribution_stock_list ldsl
+            JOIN
+            logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
         <where>
-            service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId} and is_deleted = 0
+            ldsl.service_type = #{par.serviceType} and ldsl.warehouse_id = #{par.warehouseId} and ldsl.is_deleted = 0
             <if test="par.incomingBatch != null and par.incomingBatch != ''">
-              and  incoming_batch like concat('%',#{par.incomingBatch},'%')
+              and  ldsl.incoming_batch like concat('%',#{par.incomingBatch},'%')
             </if>
             <if test="par.orderCode != null and par.orderCode != ''">
-              and  order_code like concat('%',#{par.orderCode},'%')
+              and  ldsl.order_code like concat('%',#{par.orderCode},'%')
             </if>
             <if test="par.serviceNumber != null and par.serviceNumber != ''">
-              and  service_number like concat('%',#{par.serviceNumber},'%')
+              and  ldsl.service_number like concat('%',#{par.serviceNumber},'%')
             </if>
             <if test="par.marketCode != null and par.marketCode != ''">
-              and   market_code like concat('%',#{par.marketCode},'%')
+              and   ldsl.market_code like concat('%',#{par.marketCode},'%')
             </if>
             <if test="par.marketName != null and par.marketName != ''">
-              and   market_name like concat('%',#{par.marketName},'%')
+              and   ldsl.market_name like concat('%',#{par.marketName},'%')
             </if>
             <if test="par.storeName != null and par.storeName != ''">
-              and   store_name like concat('%',#{par.storeName},'%')
+              and   ldsl.store_name like concat('%',#{par.storeName},'%')
             </if>
             <if test="par.storeCode != null and par.storeCode != ''">
-              and   store_code like concat('%',#{par.storeCode},'%')
+              and   ldsl.store_code like concat('%',#{par.storeCode},'%')
             </if>
             <if test="par.storeCode != null and par.storeCode != ''">
-              and   store_code like concat('%',#{par.storeCode},'%')
+              and   ldsl.store_code like concat('%',#{par.storeCode},'%')
             </if>
             <if test="par.cargoNumber != null and par.cargoNumber != ''">
-              and   cargo_number like concat('%',#{par.cargoNumber},'%')
+              and   ldsl.cargo_number like concat('%',#{par.cargoNumber},'%')
             </if>
             <if test="par.descriptionGoods != null and par.descriptionGoods != ''">
-              and   description_goods like concat('%',#{par.descriptionGoods},'%')
+              and   ldsl.description_goods like concat('%',#{par.descriptionGoods},'%')
             </if>
             <if test="par.brandName != null and par.brandName != ''">
-              and   brand_name like concat('%',#{par.brandName},'%')
+              and   ldsl.brand_name like concat('%',#{par.brandName},'%')
             </if>
             <if test="par.sku != null and par.sku != ''">
-              and   sku like concat('%',#{par.sku},'%')
+              and   ldsl.sku like concat('%',#{par.sku},'%')
             </if>
         </where>
     </select>