From e99789cfd3a8221ad5cc809d7abc41c16d0cad11 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 24 May 2024 10:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=9B=98=E6=9F=A5=E8=AF=A2=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/mapper/BasicdataTrayMapper.xml  | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
index a1eedfaeb..a6100efd3 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
@@ -172,23 +172,23 @@
     </select>
     <select id="selectInventoryList" resultType="com.logpm.basicdata.vo.WarehouseStockListVO">
         SELECT
-            ldsl.sku sku,
-            ldsl.description_goods descriptionGoods,
-            ldsl.cargo_number cargoNumber,
-            ldsl.cargo_unit cargoUnit,
-            ldsl.cargo_norms cargoNorms,
-            ldsl.market_name marketName,
-            ldsl.warehouse_name warehouseName,
-            lwug.position_code positionCode,
-            lwga.column_num columnNum,
-            lwga.layer_num layerNum,
-            lwtg.create_time operateTime,
-            lwtg.num num,
-            lwtg.create_user operateUser
+        ldsl.sku sku,
+        ldsl.description_goods descriptionGoods,
+        ldsl.cargo_number cargoNumber,
+        ldsl.cargo_unit cargoUnit,
+        ldsl.cargo_norms cargoNorms,
+        ldsl.market_name marketName,
+        ldsl.warehouse_name warehouseName,
+        lwga.qr_code positionCode,
+        lwtg.create_time operateTime,
+        lwtg.num num,
+        lwtg.create_user operateUser
         FROM
-            logpm_warehouse_tray_goods lwtg
-                JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id
-                left join (logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id =lwga.id) on lwug.association_id = ldsl.material_id
+        logpm_warehouse_tray_goods lwtg
+        JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id
+        LEFT JOIN logpm_warehouse_tary_allocation AS lwta ON lwtg.tray_id = lwta.tray_id
+        LEFT JOIN logpm_warehouse_updown_goods AS lwug ON lwta.allocation_id = lwug.allocation_id
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id
         <where>
             ldsl.is_deleted = 0 and lwtg.is_deleted = 0 and  lwtg.association_type = 4 and  lwtg.tray_id = #{param.id}
             <if test="param.cargoNumber !=null and param.cargoNumber != ''">
@@ -197,12 +197,12 @@
             <if test="param.descriptionGoods !=null and param.descriptionGoods != ''">
                 and ldsl.description_goods   like concat('%',#{param.descriptionGoods},'%')
             </if>
-            <if test="param.columnNum !=null and param.columnNum != ''">
-                and ldsl.column_num  like concat('%',#{param.columnNum},'%')
-            </if>
-            <if test="param.layerNum !=null and param.layerNum != ''">
-                and ldsl.layer_num  like concat('%',#{param.layerNum},'%')
-            </if>
+<!--            <if test="param.columnNum !=null and param.columnNum != ''">-->
+<!--                and ldsl.column_num  like concat('%',#{param.columnNum},'%')-->
+<!--            </if>-->
+<!--            <if test="param.layerNum !=null and param.layerNum != ''">-->
+<!--                and ldsl.layer_num  like concat('%',#{param.layerNum},'%')-->
+<!--            </if>-->
              <if test="param.cargoNorms !=null and param.cargoNorms != ''">
                 and ldsl.cargo_norms  like concat('%',#{param.cargoNorms},'%')
             </if>