From 3e5364b20f17dfa582ffe4f5e5b1f9d447041d68 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 9 Feb 2026 13:56:34 +0800
Subject: [PATCH] =?UTF-8?q?Manufacturing=20Engineering=E6=94=B9=E6=88=90MF?=
 =?UTF-8?q?G?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erf/service/impl/ErfExpApplyServiceImpl.java     |  8 ++++----
 .../erf/service/impl/ErfFlowEngineServiceImpl.java   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
index fedf8d8f..678d3895 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
@@ -963,11 +963,11 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
      */
     private Map<String, Object> getTechManagerByRole(Long userId) {
         // 1. 查询用户的角色
-        List<String> roleNames = Arrays.asList("R&D工程师", "Manufacturing Engineering工程师");
+        List<String> roleNames = Arrays.asList("R&D工程师", "MFG工程师");
         List<UserRoleDto> userRoles = sysUserDao.getUserRolesByRoleNames(userId, roleNames);
 
         if (userRoles.isEmpty()) {
-            throw new XJException("当前用户不是R&D工程师或Manufacturing Engineering工程师，无法下达申请单");
+            throw new XJException("当前用户不是R&D工程师或MFG工程师，无法下达申请单");
         }
 
         String userRoleName = userRoles.get(0).getRoleName();
@@ -977,8 +977,8 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
 
         if ("R&D工程师".equals(userRoleName)) {
             managerRoleName = "R&D经理";
-        } else if ("Manufacturing Engineering工程师".equals(userRoleName)) {
-            managerRoleName = "Manufacturing Engineering经理";
+        } else if ("MFG工程师".equals(userRoleName)) {
+            managerRoleName = "MFG经理";
         } else {
             throw new XJException("未知的工程师角色: " + userRoleName);
         }
diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfFlowEngineServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfFlowEngineServiceImpl.java
index 2b051b4d..bea01d32 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfFlowEngineServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfFlowEngineServiceImpl.java
@@ -618,7 +618,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
      * <li>TECH_MANAGER_APPROVAL：技术经理（根据创建人角色动态分配）
      *     <ul>
      *     <li>R&D工程师 → R&D经理（Jason审批）</li>
-     *     <li>Manufacturing Engineering工程师 → Manufacturing Engineering经理（Frank审批）</li>
+     *     <li>MFG工程师 → MFG经理（Frank审批）</li>
      *     </ul>
      * </li>
      * <li>PROD_MANAGER_APPROVAL：生产经理（固定角色）</li>
@@ -668,7 +668,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
      * <p><b>角色映射规则：</b></p>
      * <ul>
      * <li>R&D工程师 → R&D经理（Jason审批）</li>
-     * <li>Manufacturing Engineering工程师 → Manufacturing Engineering经理（Frank审批）</li>
+     * <li>MFG工程师 → MFG经理（Frank审批）</li>
      * </ul>
      *
      * @param applyNo 申请单号
@@ -685,11 +685,11 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         Long creatorUserId = apply.getCreatorUserId();
 
         // 2. 查询创建人的角色名称
-        List<String> roleNames = Arrays.asList("R&D工程师", "Manufacturing Engineering工程师");
+        List<String> roleNames = Arrays.asList("R&D工程师", "MFG工程师");
         List<UserRoleDto> creatorRoles = sysUserDao.getUserRolesByRoleNames(creatorUserId, roleNames);
 
         if (creatorRoles.isEmpty()) {
-            throw new XJException("创建人不是R&D工程师或Manufacturing Engineering工程师，无法提交申请单");
+            throw new XJException("创建人不是R&D工程师或MFG工程师，无法提交申请单");
         }
 
         String creatorRoleName = creatorRoles.getFirst().getRoleName();
@@ -702,8 +702,8 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         if ("R&D工程师".equals(creatorRoleName)) {
             managerRoleName = "R&D经理";
             managerName = "Jason";
-        } else if ("Manufacturing Engineering工程师".equals(creatorRoleName)) {
-            managerRoleName = "Manufacturing Engineering经理";
+        } else if ("MFG工程师".equals(creatorRoleName)) {
+            managerRoleName = "MFG经理";
             managerName = "Frank";
         } else {
             throw new XJException("未知的工程师角色: " + creatorRoleName);