diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index a89160c42..ccbb0f80f 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -650,6 +650,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>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)); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 0b2ade17d..95f7bae23 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -3725,8 +3725,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationVOList = main.getReservationVOList(); if (reservationVOList.isEmpty()) { for (ReservationVO reservationVO : reservationVOList) { - NodeFanoutMsg msgByReservation = buildNodeFanoutMsgByReservation(reservationVO,BizOperationEnums.MODIFY); - distributionNodeWorkService.planReservation(nodeFanoutMsg,AuthUtil.getUser(), myCurrentWarehouse); + NodeFanoutMsg msgByReservation = buildNodeFanoutMsgByReservation(reservationVO,BizOperationEnums.MODIFY,myCurrentWarehouse); + distributionNodeWorkService.planReservation(msgByReservation,AuthUtil.getUser()); } } distributionNodeWorkService.planDelivery(nodeFanoutMsg, AuthUtil.getUser());