修改库存品配货数据查询错误

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -761,6 +761,9 @@ public class DistributionStockupAppController extends BladeController {
 					if(ObjectUtils.isNull(list)){
 						throw new ServiceException("没有查询到包件信息");
 					}
+					if(!list.get(0).getConditions().equals("2")){
+						throw new ServiceException("当前包件不是库存品，无法备货！！");
+					}
 					WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
 					warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());
 					warehouseUpdownGoodsEntity.setAssociationId(list.get(0).getId());

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

@@ -209,9 +209,20 @@
           <!–  and lwug.association_type = '3' and lwtg.association_type = '3' –>
         </where>-->
 
-
         select DISTINCT  CONCAT(lwug.position_code ) allocation ,  lwtg.tray_code pallet,lwug.area_id areaId,ldpl.id parcelListId,lds.id stockId,
         lwug.shelf_id shelfId,lwug.allocation_id allocationId,lwtg.tray_id  trayId,ldpl.order_code orderCode,ldpl.stock_article_id stockArticleId
+        from logpm_distribution_reservation_package ldrp
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id and ldpl.order_package_status != '70'
+        LEFT JOIN logpm_distribution_stock_article ldsa on ldpl.stock_article_id = ldsa.id
+        LEFT JOIN logpm_warehouse_updown_goods lwug on ldpl.id = lwug.association_id
+        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
+        LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id and lds.reservation_id = ldrp.reservation_id
+        <where>
+        ldrp.reservation_id = #{reservationId}  and ldrp.packet_bar_status in (1,3) and ldsa.is_zero = #{isZero}
+        </where>
+
+        <!--select DISTINCT  CONCAT(lwug.position_code ) allocation ,  lwtg.tray_code pallet,lwug.area_id areaId,ldpl.id parcelListId,lds.id stockId,
+        lwug.shelf_id shelfId,lwug.allocation_id allocationId,lwtg.tray_id  trayId,ldpl.order_code orderCode,ldpl.stock_article_id stockArticleId
         from logpm_distribution_reservation_stockarticle ldrs
 
         LEFT JOIN logpm_distribution_stock_article ldsa on ldrs.stock_article_id = ldsa.id
@@ -221,8 +232,7 @@
         LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id and lds.reservation_id = ldrs.reservation_id
         <where>
             ldrs.reservation_id = #{reservationId}  and ldrs.stock_article_status in (1,3) and ldsa.is_zero =  #{isZero}
-        </where>
-
+        </where> -->
 
 
 
@@ -254,7 +264,7 @@
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3'
         and ldpl.warehouse_id = lwug.warehouse_id
-        where ldpl.order_code = ldst.incoming_batch
+        where ldpl.order_code = ldst.incoming_batch and ldpl.conditions = '2'
         )
         END allocation,
         ldrs.id deliveryDetailsId