修改备货数据查询

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

@@ -306,7 +306,7 @@
         ldslNew.cargo_unit AS cargoUnit,
         ldslNew.tray_name AS trayName,
         ldslNew.unpack AS unpack,
-        (SELECT count(*) FROM logpm_distribution_stock AS lds WHERE lds.stock_list_id = t.id AND lds.is_deleted = 0) AS realNum,
+        (SELECT count(*) FROM logpm_distribution_stock AS lds WHERE lds.stock_list_id =#{reservationId}  AND lds.is_deleted = 0) AS realNum,
         t.reservationNum as planNum,
         (
         select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
@@ -462,12 +462,12 @@
     </select>
 
     <select id="getReservationNumByReservationIdAndStockListId" resultType="Integer">
-        select ldrs.reservation_num
+        select sum(ldrs.reservation_num)
         from logpm_distribution_reservation ldr
         left join logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldr.id and ldrs.is_deleted = 0
         where ldr.id = #{reservationId}
         and ldr.is_deleted = 0
-        and ldrs.stocklist_id = #{stockListId}
+<!--     取消对库存品的限制   and ldrs.stocklist_id = #{stockListId}-->
     </select>
     <select id="getDeliverReservationInfo" resultType="com.logpm.distribution.dto.DistributionReservationDTO">
         SELECT

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

@@ -1693,7 +1693,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				throw new CustomerException(405, "包条数量与预约数量不正确");
 			}
 		} else {
-			//通过预约单id和订单
+			//通过预约单id和库存品ID 查询预约数量
 			Integer num = distributionReservationService.getReservationNumByReservationIdAndStockListId(reservationId, stockListId);
 			if (packageNum.compareTo(num) > 0) {
 				log.warn("###################createPackageCode: 包条数量与预约数量不正确");