From 8ee315bbdbdcf184dc21e7ddea62a679fbc7a5ae Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 19 May 2025 15:47:53 +0800 Subject: [PATCH 1/2] =?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 | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 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 e8056bc438..241b1e2398 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 @@ -1121,10 +1121,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService 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"); @@ -1252,8 +1255,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService 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 +1367,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -1382,10 +1387,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService 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 +1409,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -1435,10 +1444,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService 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"); From 2aa59a5a53ee5408ebf38076101d68ab56e91185 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 19 May 2025 16:03:43 +0800 Subject: [PATCH 2/2] =?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 | 14 +++++--------- 1 file changed, 5 insertions(+), 9 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 241b1e2398..9c3d2a963d 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 @@ -1254,6 +1254,11 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService appMap = new HashMap<>(); + appMap.put("sid", businessSid); + appMap.put("type", "3"); + variables.put("app", appMap); + bv.setFormVariables(variables); //特殊处理 //获取调入方组织信息 SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData(); @@ -1292,15 +1297,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService 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 resultBean = flowFeign.handleProsess(bv);