Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -179,16 +179,16 @@
         ldsl.cargo_norms cargoNorms,
         ldsl.market_name marketName,
         ldsl.warehouse_name warehouseName,
-            lwug.position_code positionCode,
+        lwga.qr_code positionCode,
-            lwga.column_num columnNum,
-            lwga.layer_num layerNum,
         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
+        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 != ''">
+<!--            <if test="param.columnNum !=null and param.columnNum != ''">-->
-                and ldsl.column_num  like concat('%',#{param.columnNum},'%')
+<!--                and ldsl.column_num  like concat('%',#{param.columnNum},'%')-->
-            </if>
+<!--            </if>-->
-            <if test="param.layerNum !=null and param.layerNum != ''">
+<!--            <if test="param.layerNum !=null and param.layerNum != ''">-->
-                and ldsl.layer_num  like concat('%',#{param.layerNum},'%')
+<!--                and ldsl.layer_num  like concat('%',#{param.layerNum},'%')-->
-            </if>
+<!--            </if>-->
              <if test="param.cargoNorms !=null and param.cargoNorms != ''">
                 and ldsl.cargo_norms  like concat('%',#{param.cargoNorms},'%')
             </if>