Merge remote-tracking branch 'origin/master'

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java

@@ -1121,10 +1121,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         String createBySid = wmsInventoryAllocateBill.getCreateBySid();
         List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
         variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
-        variables.put("ishz", true);
+        //是否合作二级站
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
+        Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
+        variables.put("ishz", f1);
         //超出二级配件库存累计金额
         SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
-        flowNodeQuery.setType(0);
+        flowNodeQuery.setType(1);
         flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
         flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
         flowNodeQuery.setProcDefId("process_hw0a2ybh");
@@ -1251,9 +1254,12 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
             }
         }
         variables.put("iscc", f0);
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        appMap.put("type", "3");
+        variables.put("app", appMap);
+        bv.setFormVariables(variables);
         //特殊处理
-        //获取调出方组织信息
-        SysOrganizationVo dcOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getOutPlatSid()).getData();
         //获取调入方组织信息
         SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
         //流程预演
@@ -1291,15 +1297,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
                 bv.setNextNodeUserSids(substring);
             }
         }
-        Map<String, Object> appMap = new HashMap<>();
-        appMap.put("sid", businessSid);
-        appMap.put("type", "3");
-        variables.put("app", appMap);
-        bv.setFormVariables(variables);
-        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
-        if (sysOrganization != null) {
-            bv.setOrgSidPath(sysOrganization.getOrgSidPath());
-        }
         bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
         if (bv.getTaskId().equals(wmsInventoryAllocateBill.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
@@ -1344,10 +1341,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         String createBySid = wmsInventoryAllocateBill.getCreateBySid();
         List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
         variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
-        variables.put("ishz", true);
+        //是否合作二级站
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
+        Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
+        variables.put("ishz", f1);
         //超出二级配件库存累计金额
         SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
-        flowNodeQuery.setType(0);
+        flowNodeQuery.setType(1);
         flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
         flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
         flowNodeQuery.setProcDefId("process_hw0a2ybh");
@@ -1363,6 +1363,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
             }
         }
         variables.put("iscc", f0);
+        bv.setFormVariables(variables);
         bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@@ -1382,10 +1383,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         String createBySid = wmsInventoryAllocateBill.getCreateBySid();
         List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
         variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
-        variables.put("ishz", true);
+        //是否合作二级站
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
+        Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
+        variables.put("ishz", f1);
         //超出二级配件库存累计金额
         SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
-        flowNodeQuery.setType(0);
+        flowNodeQuery.setType(1);
         flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
         flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
         flowNodeQuery.setProcDefId("process_hw0a2ybh");
@@ -1401,6 +1405,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
             }
         }
         variables.put("iscc", f0);
+        bv.setFormVariables(variables);
         bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@@ -1435,10 +1440,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
                 String createBySid = wmsInventoryAllocateBill.getCreateBySid();
                 List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
                 variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
-                variables.put("ishz", true);
+                //是否合作二级站
+                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
+                Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
+                variables.put("ishz", f1);
                 //超出二级配件库存累计金额
                 SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
-                flowNodeQuery.setType(0);
+                flowNodeQuery.setType(1);
                 flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
                 flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
                 flowNodeQuery.setProcDefId("process_hw0a2ybh");