From 6a09ed03c6019df9c15621354e449c4c835069d7 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Fri, 3 Apr 2026 15:02:31 +0800 Subject: [PATCH] =?UTF-8?q?change(mes/ReverseTraceController):=20=E7=BA=A0?= =?UTF-8?q?=E6=AD=A3=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DmsBillsFaultInstanceServiceImplBackup.java | 9 +++++++++ .../dromara/mes/controller/ReverseTraceController.java | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImplBackup.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImplBackup.java index 46fa36fd..80541b05 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImplBackup.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImplBackup.java @@ -484,6 +484,15 @@ // activity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH); // activity.setEndTime(new Date()); // activity.setRepairer(LoginHelper.getLoginUser() == null ? LoginHelper.getUsername() : LoginHelper.getLoginUser().getNickname()); +// 【修复】设置维修相关字段（从Bo对象传递到Entity） +// activity.setProcessHandleResolution(dmsFaultInstanceActivity.getProcessHandleResolution()); +// activity.setRepairContent(dmsFaultInstanceActivity.getRepairContent()); +// activity.setProtectedMethod(dmsFaultInstanceActivity.getProtectedMethod()); +// // 同时更新其他可能被修改的字段 +// activity.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations()); +// activity.setFaultType(dmsFaultInstanceActivity.getFaultType()); +// activity.setRepairType(dmsFaultInstanceActivity.getRepairType()); +// activity.setOutsourcingId(dmsFaultInstanceActivity.getOutsourcingId()); // dmsFaultInstanceActivityMapper.updateById(activity); // // // 批量保存处理的零部件 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ReverseTraceController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ReverseTraceController.java index 232e4757..2a478b65 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ReverseTraceController.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ReverseTraceController.java @@ -48,7 +48,7 @@ public class ReverseTraceController extends BaseController { * @param batchCode 成品批次码 * @return 追溯聚合数据 */ - @SaCheckPermission("mes:reverseTrace:query") + @SaCheckPermission("mes:reverseTrace:list") @GetMapping("/batch/{batchCode}") public R traceByBatchCode(@PathVariable String batchCode) { ReverseTraceVo result = reverseTraceService.traceByBatchCode(batchCode); @@ -70,7 +70,7 @@ public class ReverseTraceController extends BaseController { * @param industryType 行业类型 TIRE/JJ * @return 原材料投料列表 */ - @SaCheckPermission("mes:reverseTrace:query") + @SaCheckPermission("mes:reverseTrace:list") @GetMapping("/workOrder/materialInputs") public R> listMaterialInputs( @RequestParam Long planId, @@ -88,7 +88,7 @@ public class ReverseTraceController extends BaseController { * @param inspectionId 质检主表ID * @return 检验项明细列表 */ - @SaCheckPermission("mes:reverseTrace:query") + @SaCheckPermission("mes:reverseTrace:list") @GetMapping("/qc/detail/{inspectionId}") public R> listQcCheckItems(@PathVariable Long inspectionId) { List list = reverseTraceService.listQcCheckItems(inspectionId);