2025-04-10

BOM Routing 相关排除已转正的临时物料

src/main/java/com/spring/modules/change/entity/APIEntity/DoForceDrawBackParam2.java

@@ -0,0 +1,11 @@
+package com.spring.modules.change.entity.APIEntity;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class DoForceDrawBackParam2 {
+    private String userId;
+    private String requestId;
+}

src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java

@@ -376,23 +376,31 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
             }
 
             // 如果是节点更新则调用强制收回流程接口，反之则跳过这一步
-//            if ("update".equals(data.getProcessFlag())) {
-                // 强制收回流程
+            // 强制收回流程
+            // 如果当前登录人 != 当前节点审批人 就传 ismonitor
+            if (!data.getUserId().equals(inData.getUpdateBy())) {
                 DoForceDrawBackParam doForceDrawBackParam = new DoForceDrawBackParam();
                 doForceDrawBackParam.setUserId(userId);
                 doForceDrawBackParam.setRequestId(requestId);
                 HashMap<String, Object> otherParams = new HashMap<>();
-                // 如果当前登录人 != 当前节点审批人 就传 ismonitor
-                if (!data.getUserId().equals(inData.getUpdateBy())) {
-                    otherParams.put("ismonitor", "1");
-                }
+                otherParams.put("ismonitor", "1");
                 doForceDrawBackParam.setOtherParams(otherParams);
                 String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack";
                 ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam);
                 if (!"0".equals(doForceDrawBackResponses.getCode())) {
                     throw new RuntimeException("强制收回流程异常信息：" + doForceDrawBackResponses.getMsg());
                 }
-//            }
+            } else {
+                DoForceDrawBackParam2 doForceDrawBackParam = new DoForceDrawBackParam2();
+                doForceDrawBackParam.setUserId(userId);
+                doForceDrawBackParam.setRequestId(requestId);
+                String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack";
+                ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam);
+                if (!"0".equals(doForceDrawBackResponses.getCode())) {
+                    throw new RuntimeException("强制收回流程异常信息：" + doForceDrawBackResponses.getMsg());
+                }
+            }
+
             // 流程代办删除接口，删除发送的消息
             DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam();
             deleteUserRequestInfoParam.setUserId(userId);