修改备货货位查询判空

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

@@ -165,7 +165,7 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsl.incoming_batch
         LEFT JOIN logpm_warehouse_updown_goods lwug
             on lwug.association_id = ldpl.id and lwug.association_type = '3' and ldsl.warehouse_id = lwug.warehouse_id
-        where ldrs.id = #{param.deliveryDetailsId}
+        where ldrs.id = #{param.deliveryDetailsId}  and  lwug.allocation_id is not null
     </select>
 
     <select id="getLocationMarketSelection" resultType="com.logpm.distribution.vo.DistributionStockupTrayVO">
@@ -179,7 +179,7 @@
                            on lwug.association_id = ldsl.material_id and lwug.association_type = '4' and
                               ldsl.market_id = lwug.market_id
                                and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id
-        where ldrs.id = #{param.deliveryDetailsId}
+        where ldrs.id = #{param.deliveryDetailsId} and  lwug.allocation_id is not null
     </select>
     <select id="getLocationSelection" resultType="com.logpm.distribution.vo.DistributionStockupTrayVO">
         select lwug.position_code    positionCode,
@@ -192,7 +192,7 @@
                            on lwug.association_id = ldsl.material_id and lwug.association_type = '4' and
                               ldsl.market_id = lwug.market_id
                                and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id
-        where lddd.id = #{param.deliveryDetailsId}
+        where lddd.id = #{param.deliveryDetailsId}  and  lwug.allocation_id is not null
         GROUP BY lwug.position_code, lwug.allocation_id, lwug.allocation_title, lwug.num
     </select>
     <select id="getLocationSelectionOrder" resultType="com.logpm.distribution.vo.DistributionStockupTrayVO">
@@ -206,7 +206,7 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsl.incoming_batch
         LEFT JOIN logpm_warehouse_updown_goods lwug
         on lwug.association_id = ldpl.id and lwug.association_type = '3' and ldsl.warehouse_id = lwug.warehouse_id
-        where lddd.id = #{param.deliveryDetailsId}
+        where lddd.id = #{param.deliveryDetailsId}  and  lwug.allocation_id is not null
 
     </select>
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -2051,6 +2051,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						}
 						String packetBarCode = stockupDTO.getPacketBarCode();
 						Integer integer = baseMapper.selectPackageExist(stockupDTO);
+						//查询包件信息
 						if (ObjectUtils.isNotNull(integer) && integer > 0) {
 							//存在
 							queryWrapper.eq("coding",packetBarCode);