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

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -650,6 +650,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				log.info("未知的异常类型>>>>>>>>>>>>>>workOrderType:{}", workOrderType);
 				return R.fail("未知的异常类型");
 		}
+		if (!Objects.isNull(aftersalesWorkOrder.getResultIdentification())){
+			if (aftersalesWorkOrder.getResultIdentification().equals("1")){
+				workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yichuli.getValue());
+			}
+		}
 		//判断是否进行处理结果提交 如果存在则需要对工单进行状态变更并保存处理结果
 		return R.status(this.updateById(workOrderEntity));
 

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

@@ -3725,8 +3725,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		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);
+				NodeFanoutMsg<ReservationVO> msgByReservation = buildNodeFanoutMsgByReservation(reservationVO,BizOperationEnums.MODIFY,myCurrentWarehouse);
+				distributionNodeWorkService.planReservation(msgByReservation,AuthUtil.getUser());
 			}
 		}
 		distributionNodeWorkService.planDelivery(nodeFanoutMsg, AuthUtil.getUser());