From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java | 128 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 11 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..4025062 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,11 @@
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.controller.admin.pro.feedback.vo.MesProFeedbackWagePreviewReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackWagePreviewRespVO;
+import cn.iocoder.yudao.module.mes.service.pro.wage.MesProFeedbackWageBreakdown;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
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;
@@ -24,6 +31,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.service.dv.machinery.MesDvMachineryService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
@@ -56,10 +64,20 @@
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.dal.dataobject.pro.feedback.MesProFeedbackAuxDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackAuxMapper;
+import cn.iocoder.yudao.module.mes.service.pro.worktime.MesProWorktimeService;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
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 +124,16 @@
private MesWmItemConsumeLineMapper itemConsumeLineMapper;
@Resource
private MesQcIpqcMapper ipqcMapper;
+ @Resource
+ private MesProWorkOrderParamRecordMapper paramRecordMapper;
+ @Resource
+ private MesProWorkOrderParamRecordDetailMapper paramRecordDetailMapper;
+ @Resource
+ private MesProFeedbackAuxMapper feedbackAuxMapper;
+ @Resource
+ private MesProWorktimeService worktimeService;
+ @Resource
+ private MesDvMachineryService machineryService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇鎶ュ伐")
@@ -134,7 +162,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇鎶ュ伐")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
public CommonResult<MesProFeedbackRespVO> getFeedback(@RequestParam("id") Long id) {
MesProFeedbackDO feedback = feedbackService.getFeedback(id);
if (feedback == null) {
@@ -145,7 +172,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇鎶ュ伐鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
public CommonResult<PageResult<MesProFeedbackRespVO>> getFeedbackPage(@Valid MesProFeedbackPageReqVO pageReqVO) {
PageResult<MesProFeedbackDO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
return success(new PageResult<>(buildFeedbackRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -154,7 +180,6 @@
@GetMapping("/list-by-task")
@Operation(summary = "鎸変换鍔¤幏寰楁姤宸ュ巻鍙插垪琛�")
@Parameter(name = "taskId", description = "浠诲姟缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
public CommonResult<List<MesProFeedbackRespVO>> getFeedbackListByTask(@RequestParam("taskId") Long taskId) {
List<MesProFeedbackDO> list = feedbackService.getFeedbackListByTaskId(taskId);
return success(buildFeedbackRespVOList(list));
@@ -174,10 +199,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 +216,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")
@@ -204,6 +235,16 @@
public CommonResult<MesProFeedbackQuickCreateRespVO> quickCreateFeedback(
@Valid @RequestBody MesProFeedbackQuickCreateReqVO reqVO) {
return success(feedbackService.quickCreateFeedback(reqVO));
+ }
+
+ @PostMapping("/preview-wage")
+ @Operation(summary = "鎶ュ伐宸ヨ祫璇曠畻锛堜笉钀藉簱锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
+ public CommonResult<MesProFeedbackWagePreviewRespVO> previewWage(
+ @Valid @RequestBody MesProFeedbackWagePreviewReqVO reqVO) {
+ MesProFeedbackWageBreakdown breakdown = feedbackService.previewWage(reqVO);
+ MesProFeedbackWagePreviewRespVO resp = BeanUtils.toBean(breakdown, MesProFeedbackWagePreviewRespVO.class);
+ return success(resp);
}
@PostMapping("/batch-create")
@@ -219,7 +260,6 @@
@GetMapping("/trace/{id}")
@Operation(summary = "鑾峰緱鎶ュ伐杩芥函淇℃伅", description = "鎶ュ伐 + 浜у嚭/浜у嚭鏄庣粏 + 娑堣��/娑堣�楁槑缁� + IPQC妫�楠�")
@Parameter(name = "id", description = "鎶ュ伐缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
public CommonResult<MesProFeedbackTraceRespVO> getFeedbackTrace(@PathVariable("id") Long id) {
MesProFeedbackDO feedback = feedbackService.getFeedback(id);
if (feedback == null) {
@@ -278,6 +318,35 @@
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);
+ // 1.11 涓昏浠疯澶�
+ Map<Long, MesDvMachineryDO> machineryMap = machineryService.getMachineryMap(
+ convertSet(list, MesProFeedbackDO::getMachineryId));
+ // 1.10 杈呭姪宸ユ椂鏄庣粏
+ Map<Long, List<MesProFeedbackAuxDO>> feedbackAuxMap = feedbackAuxMapper
+ .selectListByFeedbackIds(convertSet(list, MesProFeedbackDO::getId)).stream()
+ .collect(Collectors.groupingBy(MesProFeedbackAuxDO::getFeedbackId));
// 2. 鎷兼帴 VO
return BeanUtils.toBean(list, MesProFeedbackRespVO.class, vo -> {
@@ -290,12 +359,15 @@
// 宸ュ簭
findAndThen(processMap, vo.getProcessId(), process ->
vo.setProcessCode(process.getCode()).setProcessName(process.getName()));
+ // 涓昏浠疯澶�
+ findAndThen(machineryMap, vo.getMachineryId(), machinery ->
+ vo.setMachineryName(machinery.getName()));
// checkFlag
findAndThen(routeProcessCheckFlagMap, vo.getRouteId(), processCheckMap ->
findAndThen(processCheckMap, vo.getProcessId(), vo::setCheckFlag));
// 宸ュ崟
findAndThen(workOrderMap, vo.getWorkOrderId(), wo ->
- vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()));
+ vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()).setReelNo(wo.getReelNo()));
// 浠诲姟
findAndThen(taskMap, vo.getTaskId(), task ->
vo.setTaskCode(task.getCode()));
@@ -311,6 +383,40 @@
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());
+ }
+ // 杈呭姪宸ユ椂鏄庣粏 + 宸ユ椂宸紓锛堟爣鍑嗗伐鏃跺彧鐢ㄤ簬鑰冩牳瀵规瘮锛�
+ List<MesProFeedbackAuxDO> auxList = feedbackAuxMap.get(vo.getId());
+ if (CollUtil.isNotEmpty(auxList)) {
+ vo.setAuxList(BeanUtils.toBean(auxList, MesProFeedbackRespVO.AuxResp.class));
+ }
+ BigDecimal standardHours = vo.getStandardWorkHours();
+ BigDecimal actualHours = vo.getWorkHours() != null ? vo.getWorkHours() : BigDecimal.ZERO;
+ if (standardHours != null && standardHours.signum() > 0) {
+ BigDecimal diff = actualHours.subtract(standardHours).setScale(2, RoundingMode.HALF_UP);
+ vo.setWorkHoursDiff(diff);
+ vo.setWorkHoursDiffRate(diff.multiply(BigDecimal.valueOf(100))
+ .divide(standardHours, 2, RoundingMode.HALF_UP));
+ String warnMessage = worktimeService.buildWarnMessage(actualHours, standardHours);
+ vo.setStandardWarnFlag(warnMessage != null);
+ vo.setStandardWarnMessage(warnMessage);
+ } else {
+ vo.setStandardWarnFlag(false);
+ }
});
}
--
Gitblit v1.9.3