From cdf5605fb5caa0da0f134893bac350785250ea8a Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 27 八月 2026 11:21:19 +0800
Subject: [PATCH] feat(mes): 基础参数与工序绑定，报工填写绑定的参数字段
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
index 010925b..ef72ab0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackApproveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackBatchCheckRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackBatchCreateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackBatchCreateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackPageReqVO;
@@ -15,6 +17,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackQuickCreateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSubmitReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
@@ -56,10 +59,15 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceLineMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderParamRecordDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderParamRecordDetailDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderParamRecordMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderParamRecordDetailMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import java.io.IOException;
import java.util.*;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -106,6 +114,10 @@
private MesWmItemConsumeLineMapper itemConsumeLineMapper;
@Resource
private MesQcIpqcMapper ipqcMapper;
+ @Resource
+ private MesProWorkOrderParamRecordMapper paramRecordMapper;
+ @Resource
+ private MesProWorkOrderParamRecordDetailMapper paramRecordDetailMapper;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇鎶ュ伐")
@@ -174,10 +186,9 @@
@PutMapping("/submit")
@Operation(summary = "鎻愪氦鎶ュ伐")
- @Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:update')")
- public CommonResult<Boolean> submitFeedback(@RequestParam("id") Long id) {
- feedbackService.submitFeedback(id);
+ public CommonResult<Boolean> submitFeedback(@Valid @RequestBody MesProFeedbackSubmitReqVO reqVO) {
+ feedbackService.submitFeedback(reqVO);
return success(true);
}
@@ -192,10 +203,17 @@
@PutMapping("/approve")
@Operation(summary = "瀹℃壒鎶ュ伐")
- @Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:approve')")
- public CommonResult<Boolean> approveFeedback(@RequestParam("id") Long id) {
- return success(feedbackService.approveFeedback(id));
+ public CommonResult<Boolean> approveFeedback(@Valid @RequestBody MesProFeedbackApproveReqVO reqVO) {
+ return success(feedbackService.approveFeedback(reqVO));
+ }
+
+ @GetMapping("/batch-requirements")
+ @Operation(summary = "妫�鏌ユ姤宸ュ鎵瑰墠鏄惁闇�瑕佸～鍐欐壒娆″睘鎬�")
+ @Parameter(name = "id", description = "鎶ュ伐鍗曠紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-feedback:approve')")
+ public CommonResult<MesProFeedbackBatchCheckRespVO> getBatchRequirements(@RequestParam("id") Long id) {
+ return success(feedbackService.checkBatchRequirements(id));
}
@PostMapping("/quick-create")
@@ -278,6 +296,28 @@
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSetByFlatMap(list, feedback ->
Stream.of(feedback.getFeedbackUserId(), feedback.getApproveUserId())));
+ // 1.9 浠诲姟鍙傛暟璁板綍锛氭姤宸ュ洖鏄惧弬鏁板��
+ Set<Long> taskIds = convertSet(list, MesProFeedbackDO::getTaskId);
+ Map<Long, List<MesProWorkOrderParamRecordDetailDO>> taskParamDetailMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(taskIds)) {
+ List<MesProWorkOrderParamRecordDO> paramRecords = paramRecordMapper.selectListByTaskIds(taskIds);
+ if (CollUtil.isNotEmpty(paramRecords)) {
+ Map<Long, List<MesProWorkOrderParamRecordDetailDO>> recordDetailMap = paramRecordDetailMapper
+ .selectListByRecordIds(convertSet(paramRecords, MesProWorkOrderParamRecordDO::getId)).stream()
+ .collect(Collectors.groupingBy(MesProWorkOrderParamRecordDetailDO::getRecordId));
+ for (MesProWorkOrderParamRecordDO record : paramRecords) {
+ taskParamDetailMap.putIfAbsent(record.getTaskId(),
+ recordDetailMap.getOrDefault(record.getId(), Collections.emptyList()));
+ }
+ }
+ }
+ Set<Long> paramUnitIds = new HashSet<>();
+ taskParamDetailMap.values().forEach(details -> details.forEach(d -> {
+ if (d.getUnitMeasureId() != null) {
+ paramUnitIds.add(d.getUnitMeasureId());
+ }
+ }));
+ Map<Long, MesMdUnitMeasureDO> paramUnitMeasureMap = unitMeasureService.getUnitMeasureMap(paramUnitIds);
// 2. 鎷兼帴 VO
return BeanUtils.toBean(list, MesProFeedbackRespVO.class, vo -> {
@@ -311,6 +351,22 @@
vo.setFeedbackUserNickname(user.getNickname()));
findAndThen(userMap, vo.getApproveUserId(), user ->
vo.setApproveUserNickname(user.getNickname()));
+ // 鍙傛暟鍊煎洖鏄撅紙浠诲姟鍙傛暟璁板綍蹇収锛屽惈蹇呭～鏍囪锛�
+ List<MesProWorkOrderParamRecordDetailDO> taskDetails = taskParamDetailMap.get(vo.getTaskId());
+ if (CollUtil.isNotEmpty(taskDetails)) {
+ vo.setParamValues(taskDetails.stream().map(detail -> {
+ MesProFeedbackRespVO.ParamValueResp pv = new MesProFeedbackRespVO.ParamValueResp();
+ pv.setDetailId(detail.getId());
+ pv.setParamCode(detail.getParamCode());
+ pv.setParamName(detail.getParamName());
+ pv.setParamType(detail.getParamType());
+ pv.setUnitMeasureName(paramUnitMeasureMap.containsKey(detail.getUnitMeasureId())
+ ? paramUnitMeasureMap.get(detail.getUnitMeasureId()).getName() : null);
+ pv.setParamValue(detail.getParamValue());
+ pv.setRequired(detail.getRequired());
+ return pv;
+ }).toList());
+ }
});
}
--
Gitblit v1.9.3