From 26094cffde1b85f3d627f9038594b39c32203b76 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 26 八月 2026 17:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index 3d3022f..e8fdc37 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -29,6 +29,7 @@
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderParamRecordService;
import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceService;
@@ -72,6 +73,9 @@
@Resource
private MesProWorkOrderService workOrderService;
@Resource
+ @Lazy
+ private MesProWorkOrderParamRecordService paramRecordService;
+ @Resource
private MesProRouteProcessService routeProcessService;
@Resource
private MesProWorkOrderBomService workOrderBomService;
@@ -109,6 +113,7 @@
.setStatus(MesProFeedbackStatusEnum.PREPARE.getStatus())
.setItemId(task.getItemId());
feedbackMapper.insert(feedback);
+ saveParamValues(task.getId(), createReqVO.getParamValues());
return feedback.getId();
}
@@ -123,6 +128,16 @@
MesProFeedbackDO updateObj = BeanUtils.toBean(updateReqVO, MesProFeedbackDO.class)
.setItemId(task.getItemId());
feedbackMapper.updateById(updateObj);
+ saveParamValues(task.getId(), updateReqVO.getParamValues());
+ }
+
+ private void saveParamValues(Long taskId, List<MesProFeedbackSaveReqVO.ParamValue> paramValues) {
+ if (CollUtil.isEmpty(paramValues)) {
+ return;
+ }
+ paramRecordService.updateTaskParamValues(taskId,
+ paramValues.stream().map(MesProFeedbackSaveReqVO.ParamValue::getDetailId).toList(),
+ paramValues.stream().map(MesProFeedbackSaveReqVO.ParamValue::getValue).toList());
}
@Override
@@ -509,6 +524,7 @@
.setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus())
.setRemark(reqVO.getRemark());
feedbackMapper.insert(feedback);
+ saveParamValues(task.getId(), reqVO.getParamValues());
// 5. 杩斿洖缁撴灉
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(task.getWorkOrderId());
return new MesProFeedbackQuickCreateRespVO()
--
Gitblit v1.9.3