Merge branch 'dev' into pre-production

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

@@ -6881,7 +6881,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionReservationPackageService.save(reservationPackageEntity);
 		Map<String, List> map = new HashMap<>();
 		map.put("1", Collections.singletonList(reservationPackageEntity));
-		NodeFanoutMsg<ReservationVO> nodeFanoutMsg = distributionReservationService.buildNodeFanoutMsgByReservation(reservationEntity, map, BizOperationEnums.MODIFY);
+		NodeFanoutMsg<ReservationVO> nodeFanoutMsg = distributionReservationService.buildNodeFanoutMsgByReservation(reservationEntity, map, BizOperationEnums.ADD);
 		distributionNodeWorkService.planReservation(nodeFanoutMsg,AuthUtil.getUser());
 		//维护包件的预约状态
 		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanAbnormalEntity.getPackageId());

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

@@ -191,7 +191,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl<Distr
 				}
 
 				distributionStockArticle.setSplitStatus(OrderSplitStatusConstant.InProgress.getValue());
-				distributionStockArticleService.save(distributionStockArticle);
+				distributionStockArticleService.updateById(distributionStockArticle);
 			});
 
 		} catch (Exception e) {