From 619c38db4073e24ddeedc20ae3bb66289809dc0d Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Mon, 19 May 2025 12:05:32 +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

---
 .../WmsInventoryAllocateBillService.java      | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

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 03ced52f91..ff5e21a1b7 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
@@ -193,7 +193,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
             dto.setCreateOrgName(sysOrganizationVo.getName());
             String sid = this.insertByDto(dto);
             for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
-                if (wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().compareTo(new BigDecimal(BigInteger.ZERO)) == 0){
+                if (wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().compareTo(new BigDecimal(BigInteger.ZERO)) == 0) {
                     deleteBySid(sid);
                     return rb.setMsg("所选商品成本价不能为0");
                 }
@@ -203,7 +203,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
             return rb.success().setData(sid);
         }
         for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
-            if (wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().compareTo(new BigDecimal(BigInteger.ZERO)) == 0){
+            if (wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().compareTo(new BigDecimal(BigInteger.ZERO)) == 0) {
                 return rb.setMsg("所选商品成本价不能为0");
             }
         }
@@ -390,7 +390,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         //获取下一环节审批角色
         List<String> candidateGroups = voList.get(0).getCandidateGroups();
         UserRoleQuery userRoleQuery = new UserRoleQuery();
-        if (candidateGroups != null && candidateGroups.size() > 0){
+        if (candidateGroups != null && candidateGroups.size() > 0) {
             userRoleQuery.setRoleSid(candidateGroups.get(0));
             if (bv.getTaskDefKey().equals("Activity_0eb1lqn")) {//调出方配件主管审批
                 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
@@ -830,19 +830,31 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         //获取下一环节审批角色
         List<String> candidateGroups = voList.get(0).getCandidateGroups();
         UserRoleQuery userRoleQuery = new UserRoleQuery();
-        if (candidateGroups != null && candidateGroups.size() > 0){
+        if (candidateGroups != null && candidateGroups.size() > 0) {
             userRoleQuery.setRoleSid(candidateGroups.get(0));
             if (bv.getTaskDefKey().equals("Activity_1kuhabd") || bv.getTaskDefKey().equals("Activity_0nhcymu")) {//调出方站长审批
-                if (!f0){
+                if (!f0) {
                     userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
                     bv.setOrgSidPath(drOrg.getOrgSidPath());
-                }else {
+                } else {
                     userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
                     bv.setOrgSidPath(dcOrg.getOrgSidPath());
                 }
+            } else if (bv.getTaskDefKey().equals("Activity_0ax87n7")) {//调出方分公司总（副总）经理审批
+                userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
+                bv.setOrgSidPath(dcOrg.getOrgSidPath());
             } else if (bv.getTaskDefKey().equals("Activity_1ri7ft5")) {//调出方省（分）公司总经理审批
                 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
                 bv.setOrgSidPath(drOrg.getOrgSidPath());
+            } else if (bv.getTaskDefKey().equals("Activity_0p4jq17")) {//调入方配件主管审批
+                userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
+                bv.setOrgSidPath(drOrg.getOrgSidPath());
+            } else if (bv.getTaskDefKey().equals("Activity_0cuo7gz")) {//调入方站长审批
+                userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
+                bv.setOrgSidPath(drOrg.getOrgSidPath());
+            } else if (bv.getTaskDefKey().equals("Activity_0x5oo96")) {//调入方分公司总（副总）经理审批
+                userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
+                bv.setOrgSidPath(drOrg.getOrgSidPath());
             }
             List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
             StringBuilder nextNodeUserSids = new StringBuilder();