库存品库位信息展示调整

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -387,6 +387,7 @@
         LEFT JOIN logpm_warehouse_updown_goods lwug on ldsi.material_id = lwug.association_id and ldsi.incoming_batch = lwug.incoming_batch
         and ldsi.market_id = lwug.market_id and lwug.association_type = '4' and lwug.warehouse_id = ldsi.warehouse_id
         <where>
+            lwug.id is not null
             <if test="param.materialId != null and param.materialId != '' "> and  ldsi.material_id = #{param.materialId}</if>
             <if test="param.marketId != null and param.marketId != '' "> and ldsi.market_id = #{param.marketId}</if>
             <if test="param.warehouseId != null and param.warehouseId != '' "> and ldsi.warehouse_id = #{param.warehouseId}</if>
@@ -414,6 +415,7 @@
         AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch
         LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '3'
         <where>
+            lwug.id is not null
             <if test="param.id != null "> and  ldsi.id = #{param.id}</if>
         </where>
         group by lwug.allocation_id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -89,7 +89,7 @@
             <if test="param.consigneeUnit != null and param.consigneeUnit != ''">and dsa.consignee_unit like
                 concat('%',#{param.consigneeUnit},'%')
             </if>
-            <if test="param.customerName != null and param.customerName != ''">and dsa.customer_name like
+            <if test="param.customerName != null and param.customerName != ''">and dbl.customer_name like
                 concat('%',#{param.customerName},'%')
             </if>
             <if test="param.customerTelephone != null and param.customerTelephone != ''">and dsa.customer_telephone like