Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -512,6 +512,7 @@
         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 ldr.reservation_status != 40
         <!--     取消对库存品的限制   and ldrs.stocklist_id = #{stockListId}-->
     </select>
     <select id="getDeliverReservationInfo" resultType="com.logpm.distribution.dto.DistributionReservationDTO">

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

@@ -106,6 +106,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDictBizClient;
@@ -3720,6 +3721,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //		distributionNodeWorkService.planDelivery(deliveryListEntity, AuthUtil.getUser(), BizOperationEnums.MODIFY);
 
 		NodeFanoutMsg<DistributionTaskVO> nodeFanoutMsg = buildNodeFanoutMsgForPlan(deliveryListEntity, AuthUtil.getUser(), BizOperationEnums.MODIFY);
+		DistributionTaskVO main = nodeFanoutMsg.getMain();
+		List<ReservationVO> reservationVOList = main.getReservationVOList();
+		if (reservationVOList.isEmpty()) {
+			for (ReservationVO reservationVO : reservationVOList) {
+				NodeFanoutMsg<ReservationVO> msgByReservation = buildNodeFanoutMsgByReservation(reservationVO,BizOperationEnums.MODIFY);
+				distributionNodeWorkService.planReservation(nodeFanoutMsg,AuthUtil.getUser(), myCurrentWarehouse);
+			}
+		}
 		distributionNodeWorkService.planDelivery(nodeFanoutMsg, AuthUtil.getUser());
 
 		trunklinePackageTrackLogClient.addPackageTrackLog(logs);
@@ -3727,6 +3736,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 
 	}
+	public NodeFanoutMsg<ReservationVO> buildNodeFanoutMsgByReservation(ReservationVO reservationVO, BizOperationEnums bizOperation,BasicdataWarehouseEntity warehouse) {
+		NodeFanoutMsg<ReservationVO> nodeFanoutMsg = new NodeFanoutMsg<>();
+
+		nodeFanoutMsg.setNode(WorkNodeEnums.PLANNED_RESERVATION);
+		nodeFanoutMsg.setBizOperation(bizOperation);
+		nodeFanoutMsg.setOperator(AuthUtil.getNickName());
+		nodeFanoutMsg.setOperatorTime(new Date());
+		nodeFanoutMsg.setWarehouse(warehouse.getName());
+		nodeFanoutMsg.setWarehouseId(warehouse.getId());
+		nodeFanoutMsg.setTenantId(AuthUtil.getTenantId());
+		nodeFanoutMsg.setMain(reservationVO);
+		return nodeFanoutMsg;
+	}
 
 	@Override
 	public NodeFanoutMsg<DistributionTaskVO> buildNodeFanoutMsgForPlan(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user, BizOperationEnums bizOperation) {