From 1892fc053e6d6a34b29ecc464cbb3d6ed0ebf29d Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Fri, 16 May 2025 17:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/flowable/biz/flow2/FlowService.java     | 8 +++++---
 .../WmsInventoryAllocateBillService.java                  | 3 ---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
index 33474bbfeb..c99b7e83c8 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
@@ -463,7 +463,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
                     nextUserSid = stringResultBean.getData();
                 }
             }
-        } else if("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))){
+        } else if ("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))) {
             if (StringUtils.isBlank(nextUserSid)) {
                 bv.setOrgSidPath(ydfOrgPath);
                 ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
@@ -475,7 +475,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
                     nextUserSid = stringResultBean.getData();
                 }
             }
-        }else if (StringUtils.isBlank(nextUserSid)) {
+        } else if (StringUtils.isBlank(nextUserSid)) {
             ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
             if (!stringResultBean.getSuccess()) {
                 //下一环节用户为空的情况
@@ -599,7 +599,9 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
                 }
             }
         }
-
+        if ("Activity_0y8ofyd".equals(bv.getTaskDefKey()) || "Activity_09chr0i".equals(bv.getTaskDefKey())) {
+            contains = false;
+        }
         if (contains) {
             bv.setUserSid(nextUserSid);
             bv.setTaskId(vo.getTaskId());
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
index 0aa164777e..81871b4784 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
@@ -391,9 +391,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         } else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批
             userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
             bv.setOrgSidPath(drOrg.getOrgSidPath());
-        } else if (bv.getTaskDefKey().equals("Activity_0kn4sub")) {//调入方站长审批
-            userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
-            bv.setOrgSidPath(dcOrg.getOrgSidPath());
         }
         List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
         StringBuilder nextNodeUserSids = new StringBuilder();