From abf1c0a35d85d38239ff5d2ed746a4e4b797c9d1 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 20 八月 2026 14:05:02 +0800
Subject: [PATCH] feat 功能修正
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 104 insertions(+), 3 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 787c3bd..c67f8d6 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,9 +8,16 @@
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;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackQuickCreateReqVO;
+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.MesProFeedbackSummaryRespVO;
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;
@@ -37,11 +44,26 @@
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackTraceRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeLineMapper;
+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.enums.MesBizTypeConstants;
+
import java.io.IOException;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Stream;
@@ -78,6 +100,17 @@
@Resource
private AdminUserApi adminUserApi;
+
+ @Resource
+ private MesWmProductProduceMapper productProduceMapper;
+ @Resource
+ private MesWmProductProduceLineMapper productProduceLineMapper;
+ @Resource
+ private MesWmItemConsumeMapper itemConsumeMapper;
+ @Resource
+ private MesWmItemConsumeLineMapper itemConsumeLineMapper;
+ @Resource
+ private MesQcIpqcMapper ipqcMapper;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇鎶ュ伐")
@@ -123,6 +156,15 @@
return success(new PageResult<>(buildFeedbackRespVOList(pageResult.getList()), pageResult.getTotal()));
}
+ @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));
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鐢熶骇鎶ュ伐 Excel")
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:export')")
@@ -155,14 +197,73 @@
@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")
+ @Operation(summary = "蹇�熸姤宸ワ紙鍒涘缓骞舵彁浜わ級")
+ @PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
+ public CommonResult<MesProFeedbackQuickCreateRespVO> quickCreateFeedback(
+ @Valid @RequestBody MesProFeedbackQuickCreateReqVO reqVO) {
+ return success(feedbackService.quickCreateFeedback(reqVO));
+ }
+
+ @PostMapping("/batch-create")
+ @Operation(summary = "鎵归噺鎶ュ伐")
+ @PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
+ public CommonResult<MesProFeedbackBatchCreateRespVO> batchCreateFeedback(
+ @Valid @RequestBody MesProFeedbackBatchCreateReqVO reqVO) {
+ return success(feedbackService.batchCreateFeedback(reqVO));
}
// ==================== 鎷兼帴 VO ====================
+ @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) {
+ return success(null);
+ }
+ MesProFeedbackTraceRespVO trace = new MesProFeedbackTraceRespVO();
+ // 1. 鎶ュ伐鏄庣粏锛堝鐢ㄥ睍绀烘嫾鎺ワ紝甯﹀伐鍗�/浠诲姟/宸ュ簭/鐗╂枡/鎶ュ伐浜虹瓑鏄剧ず鍚嶏級
+ trace.setFeedback(buildFeedbackRespVOList(ListUtil.of(feedback)).get(0));
+ // 2. 鐢熶骇浜у嚭 + 浜у嚭鏄庣粏琛岋紙鍏抽敭宸ュ簭鎵嶆湁锛�
+ trace.setProductProduce(productProduceMapper.selectByFeedbackId(id));
+ trace.setProductProduceLines(productProduceLineMapper.selectListByFeedbackId(id));
+ // 3. 鐗╂枡娑堣�� + 娑堣�楁槑缁嗚锛堝�掑啿宸ュ簭鎵嶆湁锛�
+ MesWmItemConsumeDO itemConsume = itemConsumeMapper.selectByFeedbackId(id);
+ trace.setItemConsume(itemConsume);
+ if (itemConsume != null) {
+ trace.setItemConsumeLines(itemConsumeLineMapper.selectListByConsumeId(itemConsume.getId()));
+ }
+ // 4. IPQC 杩囩▼妫�楠屽崟锛堝叧閿�+闇�妫�楠屽伐搴忔墠鏈夛級
+ trace.setIpqcList(ipqcMapper.selectListBySourceDoc(MesBizTypeConstants.PRO_FEEDBACK, id));
+ return success(trace);
+ }
+
+ @GetMapping("/summary")
+ @Operation(summary = "浣滀笟鎴愭灉姹囨�荤粺璁�", description = "鎸夋椂闂磋寖鍥存眹鎬诲凡鎵瑰噯鎶ュ伐鏁伴噺/鍚堟牸鏁伴噺锛屾寜宸ュ崟绫诲瀷銆佹棩鏈熷垎缁�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
+ public CommonResult<MesProFeedbackSummaryRespVO> getFeedbackSummary(
+ @RequestParam(value = "beginDate", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate beginDate,
+ @RequestParam(value = "endDate", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate,
+ @RequestParam(value = "workOrderType", required = false) Integer workOrderType) {
+ return success(feedbackService.getFeedbackSummary(beginDate, endDate, workOrderType));
+ }
+
private List<MesProFeedbackRespVO> buildFeedbackRespVOList(List<MesProFeedbackDO> list) {
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
--
Gitblit v1.9.3