零担BUG修复

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelNumberVO.java

@@ -36,12 +36,12 @@ public class DistributionParcelNumberVO extends DistributionParcelNumberEntity {
 	private String firsts; //零担包件名称
 //	private Integer quantity; //总数量
 	private String warehouse; //零担包件名称
-	private String orderCode; //订单自编码
-	private String serviceNumber; //服务号
+	private String orderCode; //零担包件名称
 	private Integer reservationNum; //预约数量
-	private Integer loadingNum; //装车数量
-	private Integer signingNum; //签收数量
+	private Integer loadingNum; //预约数量
+	private Integer signingNum; //预约数量
 	private Integer number; //预约数量
+	private Integer maxPlanNum; //最大计划数
 	private Long stockArticleId; //订单ID
 	private String orderPackageReservationStatus; //预约状态，限制是否能进行预约
 

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

@@ -882,17 +882,13 @@
         ldpn.stock_article_id AS stockArticleId,
         ldpn.parcel_list_id AS parcelListId,
         ldpl.firsts AS firsts,
-        ldpl.warehouse AS warehouse,
-        ldpl.order_code AS orderCode,
-        ldpl.service_number AS serviceNumber,
-        ldpl.brand_name AS brandName,
         ldpn.quantity AS quantity,
         ldpn.hand_quantity AS handQuantity,
-        ldpn.quantity AS number,
         ldpn.delivery_quantity AS deliveryQuantity,
         ldpn.outbound_quantity AS outboundQuantity,
         ldpn.signin_quantity AS signinQuantity,
-        (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum
+        (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum,
+        (ldpn.hand_quantity - ldpn.delivery_quantity) AS maxPlanNum
         FROM logpm_distribution_stock_article AS ldsa
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id

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

@@ -6025,6 +6025,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (!Func.isEmpty(loadscanEntityList)) {
 			return R.fail("当前零担已装车");
 		}
+
 		List<DistributionParcelNumberVO> zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(orderId);
 		List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.selectDeliveryZeroOrderDetail(orderId, deliveryId);
 		Map<Long, DistributionParcelNumberVO> reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2));