From 07dbfa0599934eec22dbad7bccf48da83f40c6bf Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 15 May 2025 16:07:25 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scmvehrebate/ScmVehRebateTypeStatVo.java | 2 + .../biz/scmvehrebate/ScmVehRebateMapper.xml | 2 + .../WmsInventoryAllocateBillService.java | 248 +++++++++++++++++- .../portal/sysflowpower/SysFlowNodeQuery.java | 21 ++ .../sysflowpower/SysFlowPowerFeign.java | 59 +++++ 5 files changed, 318 insertions(+), 14 deletions(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java index c794a8c83f..55908fa56d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java @@ -51,6 +51,8 @@ public class ScmVehRebateTypeStatVo implements Vo { private BigDecimal adjustmentMoney; @ApiModelProperty("未上传金额") private BigDecimal notUploadMoney; + @ApiModelProperty("其中费用合计") + private BigDecimal moneyTotal; @ApiModelProperty("预计支出费用") private BigDecimal expectItureCost; @ApiModelProperty("预计待支付费用") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index ea91f89fa4..13373f97e2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -311,6 +311,7 @@ '' AS expectItureCost, SUM(r.expectTreatCost) AS expectTreatCost, SUM(r.expectSuppCost) AS expectSuppCost, + SUM(r.expectTreatCost) + SUM(r.expectSuppCost) AS moneyTotal, SUM(r.estimateRebate) - IFNULL(SUM(r.uploadMoney), 0) - IFNULL(SUM(r.secondaryUploadMoney), 0) + IFNULL(SUM(r.adjustmentMoney), 0) - SUM(r.expectTreatCost) - SUM(r.expectSuppCost) AS balance, r.brandName, r.useOrgName, @@ -343,6 +344,7 @@ SUM(r.expectItureCost) AS expectItureCost, SUM(r.expectTreatCost) AS expectTreatCost, SUM(r.expectSuppCost) AS expectSuppCost, + SUM(r.expectItureCost) + SUM(r.expectTreatCost) + SUM(r.expectSuppCost) AS moneyTotal, SUM(r.estimateRebate) - IFNULL(SUM(r.uploadMoney), 0) - IFNULL(SUM(r.secondaryUploadMoney), 0) + IFNULL(SUM(r.adjustmentMoney), 0) - SUM(r.expectItureCost) - SUM(r.expectTreatCost) - SUM(r.expectSuppCost) AS balance, r.brandName, r.useOrgName, 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 43e1f87004..ec1e318b30 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 @@ -28,6 +28,8 @@ import com.yxt.wms.feign.message.MessageFeign; import com.yxt.wms.feign.message.MessageFlowVo; import com.yxt.wms.feign.message.MessageFlowableQuery; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; +import com.yxt.wms.feign.portal.sysflowpower.SysFlowNodeQuery; +import com.yxt.wms.feign.portal.sysflowpower.SysFlowPowerFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; @@ -66,6 +68,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService listPageVo(PagerQuery pq) { WmsInventoryAllocateBillQueryNew query = pq.getParams(); @@ -646,6 +650,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + //成本折扣价 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_9pm5umo8"); + flowNodeQuery.setParameter("成本折扣价"); + boolean f0 = false; + boolean f1 = false; + List wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList(); + for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) { + flowNodeQuery.setNodeNames("调出方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) { + flowNodeQuery.setNodeNames("调入方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f1){ + break; + } + } + variables.put("iscdy",f0); + variables.put("isrdy",f1); UserRoleQuery userRoleQuery = new UserRoleQuery(); if (list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")) { ResultBean>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); @@ -740,8 +772,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - variables.put("iscdy", true); - variables.put("isrdy", true); + //成本折扣价 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_9pm5umo8"); + flowNodeQuery.setParameter("成本折扣价"); + boolean f0 = false; + boolean f1 = false; + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(businessSid); + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("调出方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("调入方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f1){ + break; + } + } + variables.put("iscdy",f0); + variables.put("isrdy",f1); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -817,8 +875,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - variables.put("iscdy", true); - variables.put("isrdy", true); + //成本折扣价 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_9pm5umo8"); + flowNodeQuery.setParameter("成本折扣价"); + boolean f0 = false; + boolean f1 = false; + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid()); + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("调出方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("调入方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f1){ + break; + } + } + variables.put("iscdy",f0); + variables.put("isrdy",f1); bv.setModelId(wmsInventoryAllocateBill.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -838,8 +922,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - variables.put("iscdy", true); - variables.put("isrdy", true); + //成本折扣价 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_9pm5umo8"); + flowNodeQuery.setParameter("成本折扣价"); + boolean f0 = false; + boolean f1 = false; + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid()); + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("调出方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("调入方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f1){ + break; + } + } + variables.put("iscdy",f0); + variables.put("isrdy",f1); bv.setModelId(wmsInventoryAllocateBill.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -873,8 +983,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - variables.put("iscdy", true); - variables.put("isrdy", true); + //成本折扣价 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(集团内不同分公司两一级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_9pm5umo8"); + flowNodeQuery.setParameter("成本折扣价"); + boolean f0 = false; + boolean f1 = false; + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid()); + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("调出方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("调入方站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f1){ + break; + } + } + variables.put("iscdy",f0); + variables.put("isrdy",f1); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { @@ -939,7 +1075,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); variables.put("ishz", true); - variables.put("iscc", true); + //超出二级配件库存累计金额 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_hw0a2ybh"); + flowNodeQuery.setParameter("超出二级配件库存累计金额"); + boolean f0 = false; + List wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList(); + for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) { + flowNodeQuery.setNodeNames("合作二级站站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + variables.put("iscc",f0); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData(); if (sysOrganization != null) { @@ -1009,7 +1162,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); variables.put("ishz", true); - variables.put("iscc", true); + //超出二级配件库存累计金额 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_hw0a2ybh"); + flowNodeQuery.setParameter("超出二级配件库存累计金额"); + boolean f0 = false; + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(businessSid); + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("合作二级站站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + variables.put("iscc",f0); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -1063,7 +1233,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); variables.put("ishz", true); - variables.put("iscc", true); + //超出二级配件库存累计金额 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_hw0a2ybh"); + flowNodeQuery.setParameter("超出二级配件库存累计金额"); + boolean f0 = false; + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid()); + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("合作二级站站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + variables.put("iscc",f0); bv.setModelId(wmsInventoryAllocateBill.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -1084,7 +1271,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); variables.put("ishz", true); - variables.put("iscc", true); + //超出二级配件库存累计金额 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_hw0a2ybh"); + flowNodeQuery.setParameter("超出二级配件库存累计金额"); + boolean f0 = false; + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid()); + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("合作二级站站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + variables.put("iscc",f0); bv.setModelId(wmsInventoryAllocateBill.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -1119,7 +1323,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); variables.put("ishz", true); - variables.put("iscc", true); + //超出二级配件库存累计金额 + SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); + flowNodeQuery.setType(0); + flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)"); + flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); + flowNodeQuery.setProcDefId("process_hw0a2ybh"); + flowNodeQuery.setParameter("超出二级配件库存累计金额"); + boolean f0 = false; + List wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(businessSid); + for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { + flowNodeQuery.setNodeNames("合作二级站站长审批"); + flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); + if (f0){ + break; + } + } + variables.put("iscc",f0); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { @@ -1149,7 +1370,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java new file mode 100644 index 0000000000..a7b52e9a6f --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java @@ -0,0 +1,21 @@ +package com.yxt.wms.feign.portal.sysflowpower; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/27 14:49 + */ +@Data +public class SysFlowNodeQuery { + + private String flowName;//流程申请名称 + private String createOrgName;//分公司 + private String procDefId;//流程定义id + private String nodeNames;//环节名称 + private String parameter;//参数名称 + private String value;//值 + private int type; //比较类型 0是否小于权限范围 1是否大于权限范围 + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java new file mode 100644 index 0000000000..67590fca69 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.feign.portal.sysflowpower; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * Project: anrui-portal(流程权限)
+ * File: SysFlowPowerFeign.java
+ * Class: com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerFeign
+ * Description: 流程权限.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-08-27 14:31:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "流程权限") +@FeignClient( + contextId = "anrui-portal-SysFlowPower", + name = "anrui-portal", + path = "v1/sysflowpower") +public interface SysFlowPowerFeign { + + @ApiOperation("审批权限校验") + @PostMapping("/flowPermissions") + public boolean flowPermissions(@RequestBody SysFlowNodeQuery query); + + +} From 8ee78175a7eb08457efea2b385db404ba6fc91a6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 15 May 2025 16:27:48 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=A9=E6=B6=A6=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 4 ++- .../api/carsSoldProfit/CarsSoldProfit.java | 4 --- .../api/carsSoldProfit/CarsSoldProfitDto.java | 4 --- .../carsSoldProfit/CarsSoldProfitQuery.java | 2 +- .../api/carsSoldProfit/CarsSoldProfitVo.java | 12 ++++++--- .../carsSoldProfit/CarsSoldProfitMapper.xml | 24 ++++++++++++++++- .../carsSoldProfit/CarsSoldProfitService.java | 26 +++++++++---------- 7 files changed, 48 insertions(+), 28 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 7025535c34..0bdcbb36bb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1432,10 +1432,12 @@ public class BusDeliveredApplyService extends MybatisBaseService + SELECT * + FROM affiliated_company + + ${ew.sqlSegment} + + + + + \ No newline at end of file diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyQuery.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyQuery.java new file mode 100644 index 0000000000..6ea1b7471d --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyQuery.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.vehfleet.biz.affiliatedcompany; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2025/5/14 10:39 + */ +@Data +public class AffiliatedCompanyQuery implements Query { + private String corporateName;//公司名称 + +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyService.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyService.java new file mode 100644 index 0000000000..c2c73bfa9a --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyService.java @@ -0,0 +1,68 @@ + +package com.yxt.anrui.vehfleet.biz.affiliatedcompany; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 11:50 + */ +@Service +public class AffiliatedCompanyService extends MybatisBaseService { + public PagerVo listPageVo(PagerQuery pq) { + AffiliatedCompanyQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getCorporateName())){ + qw.like("corporateName",query.getCorporateName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean saveOrUpdate(AffiliatedCompanyDto dto) { + ResultBean rb=new ResultBean(); + String sid =dto.getSid(); + if(StringUtils.isNotBlank(sid)){ + AffiliatedCompany entity=fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + }else{ + AffiliatedCompany entity=new AffiliatedCompany(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("保存成功"); + } + } + public AffiliatedCompanyVo fetchSid(String sid){ + //根据sid查询的企业 + AffiliatedCompanyVo bank=baseMapper.fetchSid(sid); + return bank; + } + public ResultBean delete(String sid) { + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } + public List list(){ + return baseMapper.selectList(new QueryWrapper<>()); + + } + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + delBySids(sids); + return rb.success(); + } +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyVo.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyVo.java new file mode 100644 index 0000000000..ac00a69a5a --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/affiliatedcompany/AffiliatedCompanyVo.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.vehfleet.biz.affiliatedcompany; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2025/5/14 10:38 + */ +@Data +public class AffiliatedCompanyVo { + private String sid; + private String corporateName;//公司名称 + private String contacts;//联系人 + private String contactNumber;//联系方式 +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/Appendix.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/Appendix.java new file mode 100644 index 0000000000..d7d98969b6 --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/Appendix.java @@ -0,0 +1,53 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.vehfleet.biz.appendix; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "附件表", description = "附件表") +@TableName("appendix") +public class Appendix extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDetailsVo.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDetailsVo.java new file mode 100644 index 0000000000..f4dad5ab02 --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDetailsVo.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.vehfleet.biz.appendix; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "附件表 视图数据详情", description = "附件表 视图数据详情") +public class AppendixDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} \ No newline at end of file diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDto.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDto.java new file mode 100644 index 0000000000..739632bddc --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixDto.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.vehfleet.biz.appendix; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "附件表 数据传输对象", description = "附件表 数据传输对象") +public class AppendixDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} \ No newline at end of file diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.java new file mode 100644 index 0000000000..d927fbaf32 --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.vehfleet.biz.appendix; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface AppendixMapper extends BaseMapper { + + @Select("select * from appendix where linkSid = #{linkSid}") + List fetchByLinkSid(String linkSid); + + int deleteByLinkSid(@Param("sid") String sid,@Param("fileType") String fileType); + + @Select("select * from appendix where linkSid = #{linkSid} and fileType = #{fileType}") + List fetchByLinkSid2(@Param("linkSid") String linkSid, @Param("fileType") String type); +} \ No newline at end of file diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.xml b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.xml new file mode 100644 index 0000000000..3ca04192cf --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + delete + from appendix + where linkSid = #{sid} + + and fileType = #{fileType} + + + \ No newline at end of file diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixService.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixService.java new file mode 100644 index 0000000000..f79544dbd3 --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/appendix/AppendixService.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.vehfleet.biz.appendix; + +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class AppendixService extends MybatisBaseService { + + @Autowired + private FileUploadComponent fileUploadComponent; + + public List fetchByLinkSid(String linkSid) { + return baseMapper.fetchByLinkSid(linkSid); + } + + public void saveOrUpdateFile(String sid, List oaAppendixList, String fileType) { + baseMapper.deleteByLinkSid(sid, fileType); + if (!oaAppendixList.isEmpty()) { + oaAppendixList.forEach(v -> { + baseMapper.insert(v); + }); + } + } + + public int deleteByLinkSid(String sid, String fileType) { + return baseMapper.deleteByLinkSid(sid, fileType); + } + + public void saveFile(String sid, List files, String attachType, String fileType) { + List oaAppendixList = new ArrayList<>(); + if (!files.isEmpty()) { + for (String file : files) { + String filePath = file.replace(fileUploadComponent.getUrlPrefix(), ""); + Appendix oaAppendix = new Appendix(); + oaAppendix.setLinkSid(sid); + oaAppendix.setAttachType(attachType); + oaAppendix.setFilePath(filePath); + /* File filess = new File(fileUploadComponent.getUploadPath() + file.replace("/", File.separator)); + if (file != null) { + try { + boolean isTrue = ImageIO.read(filess) != null; + if (isTrue) { + oaAppendix.setFileType("图片"); + } else { + oaAppendix.setFileType("文件"); + } + } catch (IOException e) { + e.printStackTrace(); + } + }*/ + oaAppendix.setFileType(fileType); + oaAppendixList.add(oaAppendix); + } + } + saveOrUpdateFile(sid, oaAppendixList, fileType); + } + + public List selectByLinkSid(String sid) { + List fileList = fetchByLinkSid(sid); + List files = new ArrayList<>(); + for (Appendix oaAppendix : fileList) { + String url = fileUploadComponent.getUrlPrefix() + oaAppendix.getFilePath(); + files.add(url); + } + return files; + } + + public List selectByLinkSid(String sid, String type) { + List fileList = baseMapper.fetchByLinkSid2(sid, type); + List files = new ArrayList<>(); + for (Appendix oaAppendix : fileList) { + String url = fileUploadComponent.getUrlPrefix() + oaAppendix.getFilePath(); + files.add(url); + } + return files; + } +} \ No newline at end of file diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocuments.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocuments.java new file mode 100644 index 0000000000..c85ae1bb6a --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocuments.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.vehfleet.biz.regulatorydocuments; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2025/5/14 10:12 + */ +@Data +@ApiModel(value = "监管企业信息", description = "监管企业信息") +@TableName("regulatory_documents") +public class RegulatoryDocuments extends BaseEntity { + private String fileNameKey;//文件名 + private String fileNameValue; + private String departmentKey;//监管部门 + private String departmentValue; + private String fleetSid;//车队 + private String fleetName; + private String uploaderSid;//上传人 + private String uploaderName; +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsDto.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsDto.java new file mode 100644 index 0000000000..3cb3486908 --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsDto.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.vehfleet.biz.regulatorydocuments; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2025/5/14 10:38 + */ +@ApiModel(value = "监管企业信息 数据传输对象", description = "监管企业信息 数据传输对象") +@Data +public class RegulatoryDocumentsDto { + private String sid; + private String remarks; + private String fileNameKey;//文件名 + private String fileNameValue; + private String departmentKey;//监管部门 + private String departmentValue; + private String fleetSid;//车队 + private String fleetName; + private String uploaderSid;//上传人 + private String uploaderName; + private List filePaths; +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.java new file mode 100644 index 0000000000..0f1f8c2caf --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.vehfleet.biz.regulatorydocuments; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2023/4/12 11:49 + */ +@Mapper +public interface RegulatoryDocumentsMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + RegulatoryDocumentsVo fetchSid(@Param("sid") String sid); +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.xml b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.xml new file mode 100644 index 0000000000..39d680e9e4 --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsQuery.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsQuery.java new file mode 100644 index 0000000000..ab6659b694 --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.vehfleet.biz.regulatorydocuments; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2025/5/14 10:39 + */ +@Data +public class RegulatoryDocumentsQuery implements Query { + + private String fileNameValue;//文件名 + + private String departmentValue;//部门 + private String fleetSid;//车队 + + private String uploaderName;//上传人 + private String remarks;//备注 + private String endTime; + private String startTime; + +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsService.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsService.java new file mode 100644 index 0000000000..93fac892f5 --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsService.java @@ -0,0 +1,99 @@ + +package com.yxt.anrui.vehfleet.biz.regulatorydocuments; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.vehfleet.biz.appendix.AppendixService; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 11:50 + */ +@Service +public class RegulatoryDocumentsService extends MybatisBaseService { + @Autowired + AppendixService appendixService; + public PagerVo listPageVo(PagerQuery pq) { + RegulatoryDocumentsQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getFileNameValue())){ + qw.eq("fileNameValue",query.getFileNameValue()); + } + if(StringUtils.isNotBlank(query.getDepartmentValue())){ + qw.eq("departmentValue",query.getDepartmentValue()); + } + if(StringUtils.isNotBlank(query.getFleetSid())){ + qw.eq("fleetSid",query.getFleetSid()); + } + if(StringUtils.isNotBlank(query.getUploaderName())){ + qw.like("uploaderName",query.getUploaderName()); + } + if(StringUtils.isNotBlank(query.getRemarks())){ + qw.like("remarks",query.getRemarks()); + } + qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getStartTime() + "','%Y-%m-%d')"). + apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getEndTime() + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean saveOrUpdate(RegulatoryDocumentsDto dto) { + ResultBean rb=new ResultBean(); + String sid =dto.getSid(); + List files = dto.getFilePaths(); + if(StringUtils.isNotBlank(sid)){ + RegulatoryDocuments entity=fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + }else{ + RegulatoryDocuments entity=new RegulatoryDocuments(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + sid=entity.getSid(); + } + saveFiles(sid, files, "", "文件"); + return rb.success().setMsg("成功"); + } + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + appendixService.saveFile(sid, files, attachType, fileType); + } + public RegulatoryDocumentsVo fetchSid(String sid){ + RegulatoryDocumentsVo bank=baseMapper.fetchSid(sid); + List appes = appendixService.selectByLinkSid(sid, "文件"); + bank.setFilePaths(appes); + return bank; + } + public ResultBean delete(String sid) { + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } + public List list(){ + return baseMapper.selectList(new QueryWrapper<>()); + + } + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + delBySids(sids); + for (String sid : sids) { + appendixService.deleteByLinkSid(sid,"文件"); + } + + return rb.success(); + } +} diff --git a/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsVo.java b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsVo.java new file mode 100644 index 0000000000..39865f660b --- /dev/null +++ b/yxt-vehfleet/src/main/java/com/yxt/anrui/vehfleet/biz/regulatorydocuments/RegulatoryDocumentsVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.vehfleet.biz.regulatorydocuments; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2025/5/14 10:38 + */ +@Data +public class RegulatoryDocumentsVo { + private String sid; + private String remarks; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date createTime; + private String fileNameKey;//文件名 + private String fileNameValue; + private String departmentKey;//监管部门 + private String departmentValue; + private String fleetSid;//车队 + private String fleetName; + private String uploaderSid;//上传人 + private String uploaderName; + private List filePaths; +} From 6b29d5c80e5e0185832bdd0bf5df3b87c3489237 Mon Sep 17 00:00:00 2001 From: myTest383
Date: Thu, 15 May 2025 17:27:01 +0800 Subject: [PATCH 06/20] 111 --- yxt-vehfleet-ui/.env.development | 2 +- .../affiliatedCompany/affiliatedCompany.js | 48 +++ .../src/api/superviseFile/superviseFile.js | 39 ++ .../vehicleAdmissionApply.js | 0 .../vehicleInsuranceLedger.js | 0 .../src/api/vehicleLedger/vehicleLedger.js | 0 .../src/components/uploadFile/uploadImg.vue | 1 + yxt-vehfleet-ui/src/router/index.js | 100 ++++-- .../affiliatedCompany/affiliatedCompany.vue | 257 +++++++++++++ .../affiliatedCompanyAdd.vue | 177 +++++++++ .../src/views/superviseFile/superviseFile.vue | 339 ++++++++++++++++++ .../views/superviseFile/superviseFileAdd.vue | 296 +++++++++++++++ .../vehicleAdmissionApply.vue | 11 + .../vehicleInsuranceLedger.vue | 302 ++++++++++++++++ .../vehicleInsuranceLedgerAdd.vue | 11 + .../src/views/vehicleLedger/vehicleLedger.vue | 11 + yxt-vehfleet-ui/vue.config.js | 4 +- 17 files changed, 1558 insertions(+), 40 deletions(-) create mode 100644 yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js create mode 100644 yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js create mode 100644 yxt-vehfleet-ui/src/api/vehicleAdmissionApply/vehicleAdmissionApply.js create mode 100644 yxt-vehfleet-ui/src/api/vehicleInsuranceLedger/vehicleInsuranceLedger.js create mode 100644 yxt-vehfleet-ui/src/api/vehicleLedger/vehicleLedger.js create mode 100644 yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue create mode 100644 yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue create mode 100644 yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue create mode 100644 yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue create mode 100644 yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue create mode 100644 yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue create mode 100644 yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue create mode 100644 yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue diff --git a/yxt-vehfleet-ui/.env.development b/yxt-vehfleet-ui/.env.development index e36360e0c0..43a35a0453 100644 --- a/yxt-vehfleet-ui/.env.development +++ b/yxt-vehfleet-ui/.env.development @@ -6,5 +6,5 @@ VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 ##VUE_APP_URL = "http://26077a35f5.wicp.vip" -VUE_APP_URL = "http://192.168.0.106:8111" +VUE_APP_URL = "http://192.168.0.105:8111" diff --git a/yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js b/yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js new file mode 100644 index 0000000000..172f0f8ea8 --- /dev/null +++ b/yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/vehfleet/v1/affiliatedcompany/listPage', method: 'post', data: params, headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 查询全部列表 + listAll: function() { + return request({ + url: '/vehfleet/v1/affiliatedcompany/list', method: 'post', headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 新增、保存 + saveAffiliatedcompany: function(data) { + return request({ + url: '/vehfleet/v1/affiliatedcompany/saveOrUpdate', method: 'post', data: data, headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 初始化 + initAffiliatedcompany: function(data) { + return request({ + url: '/vehfleet/v1/affiliatedcompany/fetchSid/' + data, method: 'get' + }) + }, + + // 删除 + deleteBySids: function(data) { + return request({ + url: '/vehfleet/v1/affiliatedcompany/delBySids', method: 'DELETE', data: data, headers: { + 'Content-Type': 'application/json' + } + }) + } + +} diff --git a/yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js b/yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js new file mode 100644 index 0000000000..62f6d7c99f --- /dev/null +++ b/yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/vehfleet/v1/regulatorydocuments/listPage', method: 'post', data: params, headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 新增、保存 + saveRegulatorydocuments: function(data) { + return request({ + url: '/vehfleet/v1/regulatorydocuments/saveOrUpdate', method: 'post', data: data, headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 初始化 + initRegulatorydocuments: function(data) { + return request({ + url: '/vehfleet/v1/regulatorydocuments/fetchSid/' + data, method: 'get' + }) + }, + + // 删除 + deleteBySids: function(data) { + return request({ + url: '/vehfleet/v1/regulatorydocuments/delBySids', method: 'DELETE', data: data, headers: { + 'Content-Type': 'application/json' + } + }) + } + +} diff --git a/yxt-vehfleet-ui/src/api/vehicleAdmissionApply/vehicleAdmissionApply.js b/yxt-vehfleet-ui/src/api/vehicleAdmissionApply/vehicleAdmissionApply.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/yxt-vehfleet-ui/src/api/vehicleInsuranceLedger/vehicleInsuranceLedger.js b/yxt-vehfleet-ui/src/api/vehicleInsuranceLedger/vehicleInsuranceLedger.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/yxt-vehfleet-ui/src/api/vehicleLedger/vehicleLedger.js b/yxt-vehfleet-ui/src/api/vehicleLedger/vehicleLedger.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue b/yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue index 01a1c5d960..701580e716 100644 --- a/yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue +++ b/yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue @@ -148,6 +148,7 @@ export default { imgFiles.push(o.url) }) this.$emit('fileChange', this.files) + this.$emit('change', this.files) }, handleRemove(file, fileList) { console.log('file:' + JSON.stringify(file)) diff --git a/yxt-vehfleet-ui/src/router/index.js b/yxt-vehfleet-ui/src/router/index.js index fb34bc6a6b..9e22aab96b 100644 --- a/yxt-vehfleet-ui/src/router/index.js +++ b/yxt-vehfleet-ui/src/router/index.js @@ -1,47 +1,72 @@ import Vue from 'vue' import Router from 'vue-router' +/* Layout */ +import Layout from '@/layout' Vue.use(Router) -/* Layout */ -import Layout from '@/layout' /* 所有角色可以访问/没有权限要求的基页 */ export const constantRoutes = [{ - path: '/redirect', - component: Layout, - hidden: true, - children: [{ - path: '/redirect/:path(.*)', - component: () => import('@/views/redirect/index.vue') - }] - }, - { - path: '/', - redirect: 'index' - }, - { - path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] - }, - { - path: '/404', - component: () => - import('@/views/404'), - hidden: true - } + path: '/redirect', component: Layout, hidden: true, children: [{ + path: '/redirect/:path(.*)', component: () => import('@/views/redirect/index.vue') + }] +}, { + path: '/', redirect: 'index' +}, { + path: '/index', component: Layout, redirect: '/index', children: [{ + path: '/index', component: () => import('@/views/index.vue'), name: 'index', meta: { + title: '主页', noCache: true, affix: true + } + }] +}, { + path: '/vehicleAdmissionApply', component: Layout, redirect: '/vehicleAdmissionApply', children: [{ + path: '/vehicleAdmissionApply', + component: () => import('@/views/vehicleAdmissionApply/vehicleAdmissionApply.vue'), + name: 'VehicleAdmissionApply', + meta: { + title: '车辆准入申请管理' + } + }] +}, { + path: '/vehicleLedger', component: Layout, redirect: '/vehicleLedger', children: [{ + path: '/vehicleLedger', + component: () => import('@/views/vehicleLedger/vehicleLedger.vue'), + name: 'VehicleLedger', + meta: { + title: '挂靠车辆台账管理' + } + }] +}, { + path: '/affiliatedCompany', component: Layout, redirect: '/affiliatedCompany', children: [{ + path: '/affiliatedCompany', + component: () => import('@/views/affiliatedCompany/affiliatedCompany.vue'), + name: 'AffiliatedCompany', + meta: { + title: '挂靠公司管理' + } + }] +}, { + path: '/vehicleInsuranceLedger', component: Layout, redirect: '/vehicleInsuranceLedger', children: [{ + path: '/vehicleInsuranceLedger', + component: () => import('@/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue'), + name: 'VehicleInsuranceLedger', + meta: { + title: '车辆保险台账管理' + } + }] +}, { + path: '/superviseFile', component: Layout, redirect: '/superviseFile', children: [{ + path: '/superviseFile', + component: () => import('@/views/superviseFile/superviseFile.vue'), + name: 'SuperviseFile', + meta: { + title: '监管部门文件管理' + } + }] +}, { + path: '/404', component: () => import('@/views/404'), hidden: true +} // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] @@ -50,8 +75,7 @@ const createRouter = () => new Router({ // mode: 'history', // require service support scrollBehavior: () => ({ y: 0 - }), - routes: constantRoutes + }), routes: constantRoutes }) const router = createRouter() diff --git a/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue b/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue new file mode 100644 index 0000000000..fdb0d68e5e --- /dev/null +++ b/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue b/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue new file mode 100644 index 0000000000..e0dc1fc3f4 --- /dev/null +++ b/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue @@ -0,0 +1,177 @@ + + + + diff --git a/yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue b/yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue new file mode 100644 index 0000000000..83f5baeb6a --- /dev/null +++ b/yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue @@ -0,0 +1,339 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue b/yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue new file mode 100644 index 0000000000..47898e6817 --- /dev/null +++ b/yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue @@ -0,0 +1,296 @@ + + + + diff --git a/yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue b/yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue new file mode 100644 index 0000000000..51760449ae --- /dev/null +++ b/yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue b/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue new file mode 100644 index 0000000000..d22ba001f4 --- /dev/null +++ b/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue @@ -0,0 +1,302 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue b/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue new file mode 100644 index 0000000000..51760449ae --- /dev/null +++ b/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue b/yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue new file mode 100644 index 0000000000..51760449ae --- /dev/null +++ b/yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/yxt-vehfleet-ui/vue.config.js b/yxt-vehfleet-ui/vue.config.js index 9cb6faeadf..e29794d36b 100644 --- a/yxt-vehfleet-ui/vue.config.js +++ b/yxt-vehfleet-ui/vue.config.js @@ -24,7 +24,7 @@ module.exports = { *在大多数情况下，请使用“/”！！！ *详细信息：https://cli.vuejs.org/config/#publicpath */ - publicPath: process.env.NODE_ENV === 'production' ? '/riskcenter/' : '/', + publicPath: process.env.NODE_ENV === 'production' ? '/vehfleet/' : '/', outputDir: 'System', assetsDir: 'static', lintOnSave: process.env.NODE_ENV === 'development', @@ -41,6 +41,7 @@ module.exports = { proxy: { '/api': { // 匹配所有以 '/api'开头的请求路径 // target: 'http://127.0.0.1:8111/', + // target: 'http://192.168.0.105:8111/vehfleet', target: process.env.VUE_APP_URL, // 代理目标的基础路径 changeOrigin: true, // 支持跨域 pathRewrite: { // 重写路径: 去掉路径中开头的'/api' @@ -49,6 +50,7 @@ module.exports = { }, '/upload': { // 匹配所有以 '/api'开头的请求路径 // target: 'http://4424790b0u.qicp.vip/', + // target: 'http://192.168.0.105:8111/vehfleet', target: process.env.VUE_APP_URL, // 代理目标的基础路径 changeOrigin: true, // 支持跨域 pathRewrite: { // 重写路径: 去掉路径中开头的'/api' From 7abc3529fd397fc83e8bf80fe57de6310105496b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 16 May 2025 08:39:50 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E9=87=91=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=AA=E8=B4=B7=E4=BF=9D?= =?UTF-8?q?=E8=AF=81=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index b2fb214e47..06735cc141 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -2165,8 +2165,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Fri, 16 May 2025 10:46:01 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=A9=E6=B6=A6=E6=8A=A5=E8=A1=A8=E7=9A=84=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 14 ++++++-- .../api/carsSoldProfit/CarsSoldProfitVo.java | 6 ++-- .../carsSoldProfit/CarsSoldProfitMapper.xml | 3 +- .../carsSoldProfit/CarsSoldProfitService.java | 36 ++++++++++++++++++- .../ScmVehRebateCarsSoldProfitVo.java | 33 +++++++++++++++++ .../api/scmvehrebate/ScmVehRebateFeign.java | 5 +++ .../biz/scmvehrebate/ScmVehRebateMapper.java | 2 ++ .../biz/scmvehrebate/ScmVehRebateMapper.xml | 14 ++++++++ .../biz/scmvehrebate/ScmVehRebateRest.java | 5 +++ .../biz/scmvehrebate/ScmVehRebateService.java | 27 ++++++++++++++ 10 files changed, 138 insertions(+), 7 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateCarsSoldProfitVo.java diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 0bdcbb36bb..895b32c4bb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1441,14 +1441,22 @@ public class BusDeliveredApplyService extends MybatisBaseService diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java index ec622f2801..7bf1916d2b 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.reportcenter.api.carsSoldProfit.*; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateCarsSoldProfitVo; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; @@ -30,6 +33,8 @@ public class CarsSoldProfitService extends MybatisBaseService dtoList) { ResultBean rb = ResultBean.fireFail(); @@ -138,6 +143,35 @@ public class CarsSoldProfitService extends MybatisBaseService rebates(String sid) { - return null; + ResultBean rb = ResultBean.fireFail(); + CarsSoldProfitRebateAllVo carsSoldProfitRebateAllVo = new CarsSoldProfitRebateAllVo(); + List list = new ArrayList<>(); + String vinSid = sid; + BigDecimal expectedRebateTotalAll = BigDecimal.ZERO; + BigDecimal adjustedRebateTotalAll = BigDecimal.ZERO; + List scmList = scmVehRebateFeign.getDetailByVinSid(vinSid).getData(); + if (!scmList.isEmpty()) { + for (int i = 0; i < scmList.size(); i++) { + ScmVehRebateCarsSoldProfitVo scmVehRebateCarsSoldProfitVo = scmList.get(i); + CarsSoldProfitRebateDetailsVo carsSoldProfitRebateDetailsVo = new CarsSoldProfitRebateDetailsVo(); + carsSoldProfitRebateDetailsVo.setPolicy(scmVehRebateCarsSoldProfitVo.getPolicy()); + carsSoldProfitRebateDetailsVo.setRebateType(scmVehRebateCarsSoldProfitVo.getRebateTypeValue()); + carsSoldProfitRebateDetailsVo.setYearAndMonth(scmVehRebateCarsSoldProfitVo.getPalceGenDate()); + carsSoldProfitRebateDetailsVo.setRebateName(scmVehRebateCarsSoldProfitVo.getRebateName()); + carsSoldProfitRebateDetailsVo.setExpectedRebate(scmVehRebateCarsSoldProfitVo.getExpectedRebate()); + carsSoldProfitRebateDetailsVo.setRebatesAdjust(scmVehRebateCarsSoldProfitVo.getAdjustmentMoney()); + list.add(carsSoldProfitRebateDetailsVo); + if (StringUtils.isNotBlank(carsSoldProfitRebateDetailsVo.getExpectedRebate())) { + expectedRebateTotalAll.add(new BigDecimal(carsSoldProfitRebateDetailsVo.getExpectedRebate())); + } + if (StringUtils.isNotBlank(carsSoldProfitRebateDetailsVo.getRebatesAdjust())) { + adjustedRebateTotalAll.add(new BigDecimal(carsSoldProfitRebateDetailsVo.getRebatesAdjust())); + } + } + } + carsSoldProfitRebateAllVo.setList(list); + carsSoldProfitRebateAllVo.setAdjustedRebateTotal(adjustedRebateTotalAll.toString()); + carsSoldProfitRebateAllVo.setExpectedRebateTotal(adjustedRebateTotalAll.toString()); + return rb.success().setData(carsSoldProfitRebateAllVo); } } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateCarsSoldProfitVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateCarsSoldProfitVo.java new file mode 100644 index 0000000000..efc216583b --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateCarsSoldProfitVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.scm.api.scmvehrebate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/5/16 + **/ +@Data +public class ScmVehRebateCarsSoldProfitVo implements Vo { + private static final long serialVersionUID = -5925794987523752087L; + + @ApiModelProperty("政策方") + private String policy; + @ApiModelProperty("所属年月") + private String palceGenDate; + @ApiModelProperty("返利类型") + private String rebateTypeValue; + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("预提返利:预提返利-预提费用的结果（待支付+抵顶）") + private String expectedRebate; + @ApiModelProperty("预计待支付费用") + private String expectTreatCost; + @ApiModelProperty("预计抵顶费用") + private String expectSuppCost; + @ApiModelProperty("返利调整") + private String adjustmentMoney; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java index 7488de1e3f..fa9cd383bd 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java @@ -66,6 +66,11 @@ public interface ScmVehRebateFeign { @ResponseBody public ResultBean> getDetail(@PathVariable("sid") String sid); + @ApiOperation("车辆利润报表查询返利明细") + @GetMapping("/getDetailByVinSid") + @ResponseBody + ResultBean> getDetailByVinSid(@RequestParam("vinSid")String vinSid); + @ApiOperation("返利类型统计") @PostMapping("/typeStatistics") @ResponseBody diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java index 7cb77f32dc..36981f480d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java @@ -84,4 +84,6 @@ public interface ScmVehRebateMapper extends BaseMapper { List getDetail(String vehSid); List getTypeDetail(@Param("sids") List sids); + + List getDetailByVinSid(String vinSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index 13373f97e2..f713e55dea 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -415,4 +415,18 @@ + + diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index 7eefa1aa8f..f6e71dc107 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java @@ -89,6 +89,11 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { return rb.success().setData(scmVehRebateStatMxVos); } + @Override + public ResultBean> getDetailByVinSid(String vinSid) { + return scmVehRebateService.getDetailByVinSid(vinSid); + } + @Override public ResultBean> typeStatistics(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 688e3b2719..6770f93b91 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -2718,4 +2718,31 @@ public class ScmVehRebateService extends MybatisBaseService> getDetailByVinSid(String vinSid) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getDetailByVinSid(vinSid); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + for (int i = 0; i < list.size(); i++) { + ScmVehRebateCarsSoldProfitVo scmVehRebateCarsSoldProfitVo = list.get(i); + String expectedRebate = scmVehRebateCarsSoldProfitVo.getExpectedRebate(); + BigDecimal expectAll = BigDecimal.ZERO; + String expectTreatCost = scmVehRebateCarsSoldProfitVo.getExpectTreatCost(); + String expectSuppCost = scmVehRebateCarsSoldProfitVo.getExpectSuppCost(); + if(StringUtils.isNotBlank(expectedRebate)){ + expectAll = expectAll.add(new BigDecimal(expectedRebate)); + } + if(StringUtils.isNotBlank(expectTreatCost)){ + expectAll = expectAll.subtract(new BigDecimal(expectTreatCost)); + } + if(StringUtils.isNotBlank(expectSuppCost)){ + expectAll = expectAll.subtract(new BigDecimal(expectSuppCost)); + } + scmVehRebateCarsSoldProfitVo.setExpectedRebate(expectAll.toString()); + + } + } + return rb.success().setData(list); + } } \ No newline at end of file From 4f8ab4cfd03c9f4e0c6d408d6d54246660cdf32a Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 16 May 2025 11:25:27 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppInventoryAllocatebillFeign.java | 28 ++-- .../AppInventoryAllocatebillRest.java | 20 +-- .../AppInventoryAllocatebillService.java | 44 +++++- .../WmsInventoryAllocatebillFeign.java | 40 +++++ .../WmsInventoryAllocateBillService.java | 149 +++++++++--------- 5 files changed, 173 insertions(+), 108 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryallocatebill/AppInventoryAllocatebillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryallocatebill/AppInventoryAllocatebillFeign.java index dd8e2ca2b6..f783d494a9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryallocatebill/AppInventoryAllocatebillFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryallocatebill/AppInventoryAllocatebillFeign.java @@ -22,37 +22,37 @@ public interface AppInventoryAllocatebillFeign { /**********************************************流程********************************************/ @ApiOperation("办理") - @PutMapping("/agreeCreditInfo") + @PutMapping("/agreeCreditInfo/{type}") @ResponseBody - ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto); + ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto, @PathVariable("type") String type); @ApiOperation("驳回") - @PutMapping("/rejectCreditInfo") + @PutMapping("/rejectCreditInfo/{type}") @ResponseBody - ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query); + ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type); @ApiOperation("撤回") - @PutMapping("/recallCreditInfo") + @PutMapping("/recallCreditInfo/{type}") @ResponseBody - ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query); + ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type); @ApiOperation("终止") - @PutMapping("/stopCreditInfo") + @PutMapping("/stopCreditInfo/{type}") @ResponseBody - ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query); + ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type); @ApiOperation("获取流程操作标题") - @GetMapping("/getFlowOperateTitle") + @GetMapping("/getFlowOperateTitle/{type}") @ResponseBody - ResultBean getFlowOperateTitle(@SpringQueryMap AppFlowQuery query); + ResultBean getFlowOperateTitle(@SpringQueryMap AppFlowQuery query, @PathVariable("type") String type); @ApiOperation(value = "加签") - @PutMapping(value = "/delegate") + @PutMapping(value = "/delegate/{type}") @ResponseBody - public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery); + public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery, @PathVariable("type") String type); @ApiOperation(value = "转办") - @PutMapping(value = "/assignTask") + @PutMapping(value = "/assignTask/{type}") @ResponseBody - public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery); + public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery, @PathVariable("type") String type); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillRest.java index 1de7ba9aa0..0680bbeb8d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillRest.java @@ -49,37 +49,37 @@ public class AppInventoryAllocatebillRest implements AppInventoryAllocatebillFei } @Override - public ResultBean agreeCreditInfo(AppFlowDto dto) { - return appInventoryAllocatebillService.agreeCreditInfo(dto); + public ResultBean agreeCreditInfo(AppFlowDto dto, String type) { + return appInventoryAllocatebillService.agreeCreditInfo(dto, type); } @Override - public ResultBean rejectCreditInfo(AppFlowTaskQuery query) { - return appInventoryAllocatebillService.rejectCreditInfo(query); + public ResultBean rejectCreditInfo(AppFlowTaskQuery query, String type) { + return appInventoryAllocatebillService.rejectCreditInfo(query, type); } @Override - public ResultBean recallCreditInfo(AppFlowTaskQuery query) { + public ResultBean recallCreditInfo(AppFlowTaskQuery query, String type) { return appInventoryAllocatebillService.recallCreditInfo(query); } @Override - public ResultBean stopCreditInfo(AppFlowTaskQuery query) { + public ResultBean stopCreditInfo(AppFlowTaskQuery query, String type) { return appInventoryAllocatebillService.stopCreditInfo(query); } @Override - public ResultBean getFlowOperateTitle(AppFlowQuery query) { - return appInventoryAllocatebillService.getFlowOperateTitle(query); + public ResultBean getFlowOperateTitle(AppFlowQuery query, String type) { + return appInventoryAllocatebillService.getFlowOperateTitle(query, type); } @Override - public ResultBean delegate(AppDelegateQuery delegateQuery) { + public ResultBean delegate(AppDelegateQuery delegateQuery, String type) { return appInventoryAllocatebillService.delegate(delegateQuery); } @Override - public ResultBean assignTask(AppDelegateQuery delegateQuery) { + public ResultBean assignTask(AppDelegateQuery delegateQuery, String type) { return appInventoryAllocatebillService.assignTask(delegateQuery); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java index 9d5ab765e5..6d275229f6 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java @@ -63,7 +63,7 @@ public class AppInventoryAllocatebillService { ResultBean rb = ResultBean.fireFail(); WmsInventoryAllocateBillDetailsVoNew data = wmsInventoryAllocatebillFeign.fetchDetailsBySid(sid).getData(); AppInventoryAllocateBillDetailsVoNew appInventoryAllocateBillDetailsVoNew = new AppInventoryAllocateBillDetailsVoNew(); - BeanUtil.copyProperties(data,appInventoryAllocateBillDetailsVoNew); + BeanUtil.copyProperties(data, appInventoryAllocateBillDetailsVoNew); appInventoryAllocateBillDetailsVoNew.setProcInsId(data.getProcInstId()); List wmsInventoryAllocateBillDetailNewList = appInventoryAllocateBillDetailsVoNew.getWmsInventoryAllocateBillDetailNewList(); BigDecimal total = new BigDecimal("0"); @@ -75,7 +75,7 @@ public class AppInventoryAllocatebillService { return rb.success().setData(appInventoryAllocateBillDetailsVoNew); } - public ResultBean agreeCreditInfo(AppFlowDto dto) { + public ResultBean agreeCreditInfo(AppFlowDto dto, String type) { ResultBean rb = ResultBean.fireFail(); //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); @@ -92,18 +92,32 @@ public class AppInventoryAllocatebillService { CompleteFlowDto completeFlowDto = new CompleteFlowDto(); BeanUtil.copyProperties(dto, completeFlowDto); completeFlowDto.setOrgSidPath(orgSidPath); - ResultBean resultBean = wmsInventoryAllocatebillFeign.complete(completeFlowDto); + ResultBean resultBean = new ResultBean(); + if ("1".equals(type)) { + resultBean = wmsInventoryAllocatebillFeign.complete(completeFlowDto); + } else if ("2".equals(type)) { + resultBean = wmsInventoryAllocatebillFeign.complete2(completeFlowDto); + } else if ("3".equals(type)) { + resultBean = wmsInventoryAllocatebillFeign.complete3(completeFlowDto); + } if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } return rb.success().setData(resultBean.getData()); } - public ResultBean rejectCreditInfo(AppFlowTaskQuery query) { + public ResultBean rejectCreditInfo(AppFlowTaskQuery query, String type) { ResultBean rb = ResultBean.fireFail(); FlowTaskQuery flowTaskQuery = new FlowTaskQuery(); BeanUtil.copyProperties(query, flowTaskQuery); - ResultBean resultBean = wmsInventoryAllocatebillFeign.taskReject(flowTaskQuery); + ResultBean resultBean = new ResultBean(); + if ("1".equals(type)) { + resultBean = wmsInventoryAllocatebillFeign.taskReject(flowTaskQuery); + } else if ("2".equals(type)) { + resultBean = wmsInventoryAllocatebillFeign.taskReject2(flowTaskQuery); + } else if ("3".equals(type)) { + resultBean = wmsInventoryAllocatebillFeign.taskReject3(flowTaskQuery); + } if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } @@ -132,7 +146,7 @@ public class AppInventoryAllocatebillService { return rb.success().setData(resultBean.getData()); } - public ResultBean getFlowOperateTitle(AppFlowQuery query) { + public ResultBean getFlowOperateTitle(AppFlowQuery query, String type) { ResultBean rb = ResultBean.fireFail(); //0 上一环节 1下一环节 int next = query.getNext(); @@ -140,7 +154,14 @@ public class AppInventoryAllocatebillService { BeanUtil.copyProperties(query, getNodeQuery); String data = ""; if (next == 0) { - ResultBean> getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject(getNodeQuery); + ResultBean> getPreviousNodesForReject = new ResultBean<>(); + if ("1".equals(type)) { + getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject(getNodeQuery); + } else if ("2".equals(type)) { + getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject2(getNodeQuery); + } else if ("3".equals(type)) { + getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject3(getNodeQuery); + } if (getPreviousNodesForReject.getSuccess()) { getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); data = getPreviousNodesForReject.getData().get(0).getName(); @@ -148,7 +169,14 @@ public class AppInventoryAllocatebillService { return rb.setMsg(getPreviousNodesForReject.getMsg()); } } else if (next == 1) { - ResultBean> getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery); + ResultBean> getNextNodesForSubmit = new ResultBean<>(); + if ("1".equals(type)) { + getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery); + } else if ("2".equals(type)) { + getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery); + } else if ("3".equals(type)) { + getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery); + } if (getNextNodesForSubmit.getSuccess()) { getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); data = getNextNodesForSubmit.getData().get(0).getName(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryallocatebill/WmsInventoryAllocatebillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryallocatebill/WmsInventoryAllocatebillFeign.java index dd336501d0..ffae2c0633 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryallocatebill/WmsInventoryAllocatebillFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryallocatebill/WmsInventoryAllocatebillFeign.java @@ -22,6 +22,8 @@ public interface WmsInventoryAllocatebillFeign { @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + /*********************************************************调拨申请(分公司内)流程************************************************************/ + @ApiOperation(value = "办理（同意）") @PostMapping("/complete") public ResultBean complete(@Valid @RequestBody CompleteFlowDto query); @@ -38,6 +40,44 @@ public interface WmsInventoryAllocatebillFeign { @PostMapping(value = "/reject") public ResultBean taskReject(@Valid @RequestBody FlowTaskQuery query); + /*********************************************************调拨申请(集团内)流程************************************************************/ + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete2") + public ResultBean complete2(@Valid @RequestBody CompleteFlowDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject2") + ResultBean> getPreviousNodesForReject2(@Valid @SpringQueryMap FlowNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit2") + ResultBean> getNextNodesForSubmit2(@Valid @SpringQueryMap FlowNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject2") + public ResultBean taskReject2(@Valid @RequestBody FlowTaskQuery query); + + /*********************************************************调拨申请(一级站内)流程************************************************************/ + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete3") + public ResultBean complete3(@Valid @RequestBody CompleteFlowDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject3") + ResultBean> getPreviousNodesForReject3(@Valid @SpringQueryMap FlowNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit3") + ResultBean> getNextNodesForSubmit3(@Valid @SpringQueryMap FlowNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject3") + public ResultBean taskReject3(@Valid @RequestBody FlowTaskQuery query); + + /*********************************************************共用************************************************************/ + @ApiOperation(value = "撤回流程") @PostMapping(value = "/revokeProcess") public ResultBean revokeProcess(@Valid @RequestBody FlowTaskQuery query); 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 ec1e318b30..fa3defbc62 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 @@ -239,6 +239,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("type", "1"); variables.put("app", appMap); //判断发起人是否为配件主管 String createBySid = wmsInventoryAllocateBill.getCreateBySid(); @@ -260,7 +261,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("type", "1"); 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.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批 - ResultBean>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); - List candidateGroups = voList.get(0).getCandidateGroups(); - UserRoleQuery userRoleQuery = new UserRoleQuery(); - userRoleQuery.setRoleSid(candidateGroups.get(0)); + //特殊处理 + //获取调出方组织信息 + SysOrganizationVo dcOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getOutPlatSid()).getData(); + //获取调入方组织信息 + SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData(); + //流程预演 + ResultBean>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + //获取下一环节审批角色 + List candidateGroups = voList.get(0).getCandidateGroups(); + UserRoleQuery userRoleQuery = new UserRoleQuery(); + userRoleQuery.setRoleSid(candidateGroups.get(0)); + if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); - List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); - StringBuilder nextNodeUserSids = new StringBuilder(); - if (sysUserVos.size() > 0) { - for (SysUserVo sysUserVo : sysUserVos) { - String sid = sysUserVo.getSid(); - nextNodeUserSids.append(sid).append(","); - } - } - if (StringUtils.isBlank(nextNodeUserSids)) { - bv.setNextNodeUserSids(""); - } else { - String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); - bv.setNextNodeUserSids(substring); - } - }else if (bv.getTaskDefKey().equals("Activity_0kn4sub")){//调入方站长审批 - ResultBean>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); - List candidateGroups = voList.get(0).getCandidateGroups(); - UserRoleQuery userRoleQuery = new UserRoleQuery(); - userRoleQuery.setRoleSid(candidateGroups.get(0)); + bv.setOrgSidPath(dcOrg.getOrgSidPath()); + } else if (bv.getTaskDefKey().equals("Activity_0kn4sub")) {//调入方站长审批 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); - List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); - StringBuilder nextNodeUserSids = new StringBuilder(); - if (sysUserVos.size() > 0) { - for (SysUserVo sysUserVo : sysUserVos) { - String sid = sysUserVo.getSid(); - nextNodeUserSids.append(sid).append(","); - } - } - if (StringUtils.isBlank(nextNodeUserSids)) { - bv.setNextNodeUserSids(""); - } else { - String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); - bv.setNextNodeUserSids(substring); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } + List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); + StringBuilder nextNodeUserSids = new StringBuilder(); + if (sysUserVos.size() > 0) { + for (SysUserVo sysUserVo : sysUserVos) { + String sid = sysUserVo.getSid(); + nextNodeUserSids.append(sid).append(","); } } + if (StringUtils.isBlank(nextNodeUserSids)) { + return rb.setMsg("下一环节暂无审批人员，请联系管理员"); + } else { + String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); + bv.setNextNodeUserSids(substring); + } if (bv.getTaskId().equals(wmsInventoryAllocateBill.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -503,6 +493,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("type", "1"); variables.put("app", appMap); //判断发起人是否为配件主管 String createBySid = wmsInventoryAllocateBill.getCreateBySid(); @@ -645,6 +636,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("type", "2"); variables.put("app", appMap); //判断发起人是否为配件主管 String createBySid = wmsInventoryAllocateBill.getCreateBySid(); @@ -664,7 +656,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); @@ -786,7 +778,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("type", "2"); variables.put("app", appMap); bv.setFormVariables(variables); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData(); @@ -889,7 +882,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -936,7 +929,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -978,6 +971,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("type", "2"); variables.put("app", appMap); //判断发起人是否为配件主管 String createBySid = wmsInventoryAllocateBill.getCreateBySid(); @@ -997,7 +991,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { @@ -1069,6 +1063,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("type", "3"); variables.put("app", appMap); //判断发起人是否为配件主管 String createBySid = wmsInventoryAllocateBill.getCreateBySid(); @@ -1088,11 +1083,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 sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData(); @@ -1246,11 +1242,11 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -1284,11 +1280,11 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -1317,6 +1313,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("type", "3"); variables.put("app", appMap); //判断发起人是否为配件主管 String createBySid = wmsInventoryAllocateBill.getCreateBySid(); @@ -1336,11 +1333,11 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { From 1f1f5cee02469fd8b27235e8b2add1f0430085fb Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 16 May 2025 11:56:31 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=A9=E6=B6=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carsSoldProfit/CarsSoldProfitService.java | 31 +++++++++++++++---- .../ScmVehRebateCarsSoldProfitVo.java | 2 +- .../biz/scmvehrebate/ScmVehRebateService.java | 4 +-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java index 7bf1916d2b..57ffb86081 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java @@ -138,6 +138,25 @@ public class CarsSoldProfitService extends MybatisBaseService pagging = baseMapper.listPage(page, qw); List recordList = pagging.getRecords(); recordList.removeAll(Collections.singleton(null)); + if(!recordList.isEmpty()){ + for (int i = 0; i < recordList.size(); i++) { + CarsSoldProfitVo carsSoldProfitVo = recordList.get(i); + //预计毛利=出库价-成本+服务费+返利-中介费-调车费 + BigDecimal expectedMaoriBig = BigDecimal.ZERO; + String vinSid = carsSoldProfitVo.getVinSid(); + CarsSoldProfitRebateAllVo carsSoldProfitRebateAllVo = rebates(vinSid).getData(); + if(carsSoldProfitRebateAllVo != null){ + String expectedRebateTotal = carsSoldProfitRebateAllVo.getExpectedRebateTotal(); + carsSoldProfitVo.setRebatesTotal(expectedRebateTotal); + } + if(StringUtils.isNotBlank(carsSoldProfitVo.getExStockPrice())){ + expectedMaoriBig = expectedMaoriBig.add(new BigDecimal(carsSoldProfitVo.getExStockPrice())); + } + + + + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -158,20 +177,20 @@ public class CarsSoldProfitService extends MybatisBaseService Date: Fri, 16 May 2025 14:07:56 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/api/scmcollectionrebate/ScmCollectionRebate.java | 3 +++ .../yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java | 3 +++ .../scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java | 3 +++ .../anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java | 3 +++ .../anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java | 3 +++ .../com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java | 5 +++-- .../anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java | 3 +++ .../com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java | 3 +++ .../yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java | 3 +++ .../com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java | 2 ++ 10 files changed, 29 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java index 8eb5df621c..b1afa3eb50 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java @@ -115,4 +115,7 @@ public class ScmCollectionRebate extends BaseEntity { private String isReduceTop; @ApiModelProperty("组织全路径") private String orgPath; + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java index d1a4122d6f..b1f7ef2bee 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java @@ -139,4 +139,7 @@ public class ScmSpecialRebate extends BaseEntity { private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java index db1dcc3bbc..35f9312263 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java @@ -150,6 +150,9 @@ public class ScmSpecialRebateDetailsVo implements Vo { private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; private String specialRebateSid; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java index b79af8a332..8f2e24b84d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java @@ -136,4 +136,7 @@ public class ScmSpecialRebateDto implements Dto { private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java index fcc9367399..667a25a00e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java @@ -144,4 +144,7 @@ public class ScmSpecialRebateVo implements Vo { private String secondCheckState; @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java index 9eb5df918d..dd5d749256 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java @@ -153,6 +153,7 @@ public class ScmVehRebate extends BaseEntity { private String purchaseSystemSid; @ApiModelProperty("采购系统") private String purchaseSystemName; - - + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java index d88e650ec7..e602ca7a62 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java @@ -174,6 +174,9 @@ public class ScmVehRebateDetailsVo implements Vo { private String purchaseSystemSid; @ApiModelProperty("采购系统") private String purchaseSystemName; + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; private String vehRebateSid; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java index a9418b2d7e..e683e7f291 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java @@ -67,6 +67,9 @@ public class ScmVehRebateDto implements Dto { private String calculationModeKey; @ApiModelProperty("计算方式Value") private String calculationModeValue; + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; @ApiModelProperty("调整状态") private Integer adjustmentState; @ApiModelProperty("组织全路径") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java index 4af73a11b2..8862cb62cd 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java @@ -154,4 +154,7 @@ public class ScmVehRebateVehDto implements Dto { private String purchaseSystemSid; @ApiModelProperty("采购系统") private String purchaseSystemName; + @ApiModelProperty("返利政策方") + private String policySideKey; + private String policySideValue; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java index 0b2dc2272e..72ebe97f10 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java @@ -158,4 +158,6 @@ public class ScmVehRebateVo implements Vo { private BigDecimal notUploadMoney; @ApiModelProperty("二次核对状态") private String secondCheckState; + @ApiModelProperty("返利政策方") + private String policySideValue; } From 35da3b6821605f07511d813fa2f2156c3f1ea4d5 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 16 May 2025 14:51:04 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=A9=E6=B6=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 4 +-- .../CarsSoldProfitRebateAllVo.java | 2 ++ .../carsSoldProfit/CarsSoldProfitMapper.xml | 1 - .../carsSoldProfit/CarsSoldProfitService.java | 35 +++++++++++++++++++ .../ScmVehRebateCarsSoldProfitVo.java | 3 ++ .../biz/scmvehrebate/ScmVehRebateMapper.xml | 3 +- 6 files changed, 44 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 895b32c4bb..ffbbdd13c3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1454,9 +1454,9 @@ public class BusDeliveredApplyService extends MybatisBaseService scmList = scmVehRebateFeign.getDetailByVinSid(vinSid).getData(); if (!scmList.isEmpty()) { for (int i = 0; i < scmList.size(); i++) { @@ -186,9 +219,11 @@ public class CarsSoldProfitService extends MybatisBaseService Date: Fri, 16 May 2025 15:19:51 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java index 2b409e7093..426a322d4b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java @@ -18,7 +18,7 @@ public enum ProcDefEnum { WMSOTHEROUTAPPLY("其他出库（报损出库）", "process_iks2hour:1:14197560"), WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"), WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"), - WMSINVENTORYALLOCATEBILLTHREE("调拨申请(集团内同一分公司两一级站间调拨)", "process_6clsvwsg:1:14177512"), + WMSINVENTORYALLOCATEBILLTHREE("调拨申请(集团内同一分公司两一级站间调拨)", "process_6clsvwsg:2:20102504"), ; From a5815d677e399bb4bdbf47df2a429ac4fdc518a9 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 16 May 2025 15:56:20 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E5=86=85=E8=B4=AD=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=A9=E6=B6=A6=E6=8A=A5=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-base/anrui-base-biz/pom.xml | 20 +++- .../com/yxt/anrui/base/BaseApplication.java | 2 +- .../BaseAccadjApplyMapper.java | 5 + .../baseaccadjapply/BaseAccadjApplyMapper.xml | 9 ++ .../BaseAccadjApplyService.java | 106 ++++++++++++++++++ .../BaseAccadjApplyeVehMapper.java | 2 + .../BaseAccadjApplyeVehMapper.xml | 4 + .../BaseAccadjApplyeVehService.java | 4 + .../BusDeliveredApplyMapper.xml | 2 +- .../BusDeliveredApplyService.java | 6 - 10 files changed, 147 insertions(+), 13 deletions(-) diff --git a/anrui-base/anrui-base-biz/pom.xml b/anrui-base/anrui-base-biz/pom.xml index 2559db65ed..38b1022006 100644 --- a/anrui-base/anrui-base-biz/pom.xml +++ b/anrui-base/anrui-base-biz/pom.xml @@ -2,12 +2,17 @@ - - com.yxt - yxt-parent + + com.yxt + yxt-parent + 0.0.1 + + + 4.0.0 @@ -16,6 +21,11 @@ 0.0.1 + + anrui-reportcenter-api + com.yxt.anrui + 0.0.1-SNAPSHOT + com.yxt.messagecenter message-center-api diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java index 24218ee78d..a9a172c38a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java @@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.common.base.config", "com.yxt.anrui.base" }) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin","com.yxt.messagecenter"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin","com.yxt.messagecenter","com.yxt.anrui.reportcenter"}) public class BaseApplication { public static void main(String[] args) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java index 65e477c861..6e3d03f0c5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java @@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.baseaccadjapply.AppCompanyAdjustVo; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -58,4 +59,8 @@ public interface BaseAccadjApplyMapper extends BaseMapper { String selectNum(String bill); AppCompanyAdjustVo getCompanyAdjust(String sid); + + ScmVehicleGression selectByLocationAndVin(@Param("locationSid") String locationSid, @Param("vinSid") String sid); + + int selectCOuntByScmSid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml index 518d8c5817..1451c2949b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml @@ -84,4 +84,13 @@ from base_accadj_apply where sid = #{sid} + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 41e24c37b9..5e5417515a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -31,6 +31,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.baseaccadjapply.*; import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery; import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery; @@ -38,6 +39,7 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo; import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto; import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh; import com.yxt.anrui.base.api.baseaccadjapply.AppVehicleVersionVo; +import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; @@ -55,6 +57,10 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; @@ -81,19 +87,25 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; +import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto; +import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitFeign; import com.yxt.anrui.riskcenter.api.loandiff.LoanDiff; import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffInitDetails; import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffPdfVo; import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.utils.ConstantUtils; import com.yxt.common.base.utils.WordUtils; import com.yxt.messagecenter.api.message.Message; import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import com.yxt.messagecenter.api.messagelist.MessageList; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; @@ -102,11 +114,15 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; +import java.util.concurrent.*; import java.util.stream.Collectors; import static java.util.Comparator.comparing; @@ -154,6 +170,8 @@ public class BaseAccadjApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { BaseAccadjApplyQuery query = pq.getParams(); @@ -712,6 +730,21 @@ public class BaseAccadjApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BaseAccadjApply finalBaseAccadjApply = baseAccadjApply; + Future future1 = pool.submit(() -> { + pushCarSoldProfit(finalBaseAccadjApply); + }); + } catch (Exception e) { + e.printStackTrace(); + } + } return rb.success().setData(resultBean.getData()); } else { @@ -719,6 +752,79 @@ public class BaseAccadjApplyService extends MybatisBaseService dtoList = new ArrayList<>(); + if("调出".equals(baseAccadjApply.getAccadjTypeValue())){ + List detailsList = baseAccadjApplyeVehService.selectByMainSid(baseAccadjApply.getSid()); + detailsList.removeAll(Collections.singleton(null)); + if (!detailsList.isEmpty()) { + for (int i = 0; i < detailsList.size(); i++) { + BaseAccadjApplyeVeh baseAccadjApplyeVeh = detailsList.get(i); + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseAccadjApplyeVeh.getPurchaseSid()); + BaseVehicle baseVehicle= baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle.getVinNo(), baseAccadjApply.getCallOutOrgSid()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(baseAccadjApply.getCreateBySid()).getData(); + CarsSoldProfitDto carsSoldProfitDto = new CarsSoldProfitDto(); + if(sysUserVo != null){ + carsSoldProfitDto.setStaffSid(sysUserVo.getStaffSid());//销售专员 + carsSoldProfitDto.setStaffName(sysUserVo.getName()); + carsSoldProfitDto.setCustomerSid(baseAccadjApply.getCallInOrgSid()); + carsSoldProfitDto.setCustomerName(baseAccadjApply.getCallInOrgName()); + } + //车辆台账中取 + carsSoldProfitDto.setOrgSidPath(baseVehicle.getOrgSidPath()); + //分公司 + carsSoldProfitDto.setUseOrgSid(baseVehicle.getUseOrgSid()); + carsSoldProfitDto.setUseOrgName(baseVehicle.getUseOrgName()); + //销售日期 + carsSoldProfitDto.setSaleDate(new Date()); + //车架号 + carsSoldProfitDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); + carsSoldProfitDto.setVinSid(baseVehicle.getSid()); + //车型 + carsSoldProfitDto.setVehModelSid(baseVehicle.getModelSid()); + carsSoldProfitDto.setVehMConfigSid(baseVehicle.getModelConfigSid()); + //采购系统 + carsSoldProfitDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); + carsSoldProfitDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + //入库价-内销价格 + carsSoldProfitDto.setCostPrice(baseInternalPurchaseVehicle.getInitialWitPinMoney()); + //出库价 + carsSoldProfitDto.setExStockPrice(baseInternalPurchaseVehicle.getWitPinMoney()); + //存放地点 + carsSoldProfitDto.setLocationSid(baseVehicle.getLocation()); + carsSoldProfitDto.setLocationName(baseVehicle.getLocationName()); + //排产订单编号 + carsSoldProfitDto.setSchedulingId(baseVehicle.getOrderingNo()); + //数据日期 + carsSoldProfitDto.setCreateDate(new Date()); + //事业部 + List stringList = Arrays.asList(carsSoldProfitDto.getOrgSidPath().split("/")); + String busSid = stringList.get(1); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(busSid).getData(); + carsSoldProfitDto.setDivision(sysOrganization.getName()); + carsSoldProfitDto.setDivisionSid(busSid); + dtoList.add(carsSoldProfitDto); + //查询存放地点变更的申请经费以及台数 + ScmVehicleGression scmVehicleGression = baseMapper.selectByLocationAndVin(carsSoldProfitDto.getLocationSid(),baseVehicle.getSid()); + if(scmVehicleGression != null){ + BigDecimal allMon = BigDecimal.ZERO; + String applicantFunds = scmVehicleGression.getApplicantFunds(); + int vount = baseMapper.selectCOuntByScmSid(scmVehicleGression.getSid()); + if(StringUtils.isNotBlank(applicantFunds) && new BigDecimal(applicantFunds).compareTo(BigDecimal.ZERO)>0){ + allMon = new BigDecimal(applicantFunds).divide(new BigDecimal(vount),2, RoundingMode.HALF_UP); + } + carsSoldProfitDto.setMoveCarPrice(allMon.toString()); + } + } + } + if (!dtoList.isEmpty()) { + ResultBean resultBean = carsSoldProfitFeign.saveOrUpdate(dtoList); + } + } + + } + + //调车调账构造销售出库单数据 private void createSalOutStock(BaseAccadjApply baseAccadjApply) { //获取车辆台账表中的采购部门sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java index 2c2dbe430b..26805996c8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java @@ -55,4 +55,6 @@ public interface BaseAccadjApplyeVehMapper extends BaseMapper fetchByAccSidAndCallOutOrgSid(@Param("sid") String sid, @Param("callOutOrgSid") String callOutOrgSid); List getListBySid(String sid); + + List selectByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml index 16f7035232..7ce2e5224c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml @@ -52,4 +52,8 @@ on av.purchaseSid = pv.sid where av.accadjSid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java index 2425a64f77..4b20b1fe49 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java @@ -111,4 +111,8 @@ public class BaseAccadjApplyeVehService extends MybatisBaseService getListBySid(String sid) { return baseMapper.getListBySid(sid); } + + public List selectByMainSid(String sid) { + return baseMapper.selectByMainSid(sid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 5b13b46929..ecc127e287 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -249,6 +249,6 @@ \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index ffbbdd13c3..51e6822cd7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1444,19 +1444,13 @@ public class BusDeliveredApplyService extends MybatisBaseService Date: Fri, 16 May 2025 16:01:11 +0800 Subject: [PATCH 15/20] =?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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 fa3defbc62..7eae919045 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 @@ -379,7 +379,10 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService candidateGroups = voList.get(0).getCandidateGroups(); UserRoleQuery userRoleQuery = new UserRoleQuery(); userRoleQuery.setRoleSid(candidateGroups.get(0)); - if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批 + if (bv.getTaskDefKey().equals("Activity_0y8ofyd")) {//调入方配件主管审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + }else if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); bv.setOrgSidPath(drOrg.getOrgSidPath()); } else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批 From 2da16a6ae667953882c1477b7b743ed19204c47d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 16 May 2025 16:11:05 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=A9=E6=B6=A6=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/baseaccadjapply/BaseAccadjApplyRest.java | 6 ++++++ .../base/biz/baseaccadjapply/BaseAccadjApplyService.java | 7 +++++++ .../biz/carsSoldProfit/CarsSoldProfitService.java | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java index 8d27c6bf8e..53427a1b88 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java @@ -149,4 +149,10 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign { public ResultBean getCompanyAdjust(String sid) { return baseAccadjApplyService.getCompanyAdjust(sid); } + + @PostMapping("pushReport") + @ApiOperation("测试推送车辆利润报表") + ResultBean pushReport(@RequestParam("sid")String sid){ + return baseAccadjApplyService.pushReport(sid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 5e5417515a..cc200916ad 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -1400,4 +1400,11 @@ public class BaseAccadjApplyService extends MybatisBaseService Date: Fri, 16 May 2025 16:12:40 +0800 Subject: [PATCH 17/20] =?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 | 15 +++++++++------ 1 file changed, 9 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 7eae919045..0aa164777e 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 @@ -379,18 +379,21 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService candidateGroups = voList.get(0).getCandidateGroups(); UserRoleQuery userRoleQuery = new UserRoleQuery(); userRoleQuery.setRoleSid(candidateGroups.get(0)); - if (bv.getTaskDefKey().equals("Activity_0y8ofyd")) {//调入方配件主管审批 + if (bv.getTaskDefKey().equals("Activity_0eb1lqn")) {//调出方配件主管审批 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); bv.setOrgSidPath(drOrg.getOrgSidPath()); - }else if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批 - userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); - bv.setOrgSidPath(drOrg.getOrgSidPath()); - } else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批 + } else if (bv.getTaskDefKey().equals("Activity_0y8ofyd")) {//调入方配件主管审批 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); bv.setOrgSidPath(dcOrg.getOrgSidPath()); - } else if (bv.getTaskDefKey().equals("Activity_0kn4sub")) {//调入方站长审批 + } else if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); + bv.setOrgSidPath(dcOrg.getOrgSidPath()); + } 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 sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); StringBuilder nextNodeUserSids = new StringBuilder(); From 1892fc053e6d6a34b29ecc464cbb3d6ed0ebf29d Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 16 May 2025 17:32:56 +0800 Subject: [PATCH 18/20] =?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 { 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 stringResultBean = getNextNodeUserSidsOfSubmit(bv); @@ -475,7 +475,7 @@ public class FlowService extends MybatisBaseService { nextUserSid = stringResultBean.getData(); } } - }else if (StringUtils.isBlank(nextUserSid)) { + } else if (StringUtils.isBlank(nextUserSid)) { ResultBean stringResultBean = getNextNodeUserSidsOfSubmit(bv); if (!stringResultBean.getSuccess()) { //下一环节用户为空的情况 @@ -599,7 +599,9 @@ public class FlowService extends MybatisBaseService { } } } - + 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 sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); StringBuilder nextNodeUserSids = new StringBuilder(); From c6b376d676cc8893b2e87daea9bbdcbf6d844de2 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 16 May 2025 17:48:42 +0800 Subject: [PATCH 19/20] =?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 | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 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 81871b4784..fbf79bf70c 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 @@ -378,19 +378,21 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService candidateGroups = voList.get(0).getCandidateGroups(); UserRoleQuery userRoleQuery = new UserRoleQuery(); - userRoleQuery.setRoleSid(candidateGroups.get(0)); - if (bv.getTaskDefKey().equals("Activity_0eb1lqn")) {//调出方配件主管审批 - userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); - bv.setOrgSidPath(drOrg.getOrgSidPath()); - } else if (bv.getTaskDefKey().equals("Activity_0y8ofyd")) {//调入方配件主管审批 - userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); - bv.setOrgSidPath(dcOrg.getOrgSidPath()); - } else if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批 - userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); - bv.setOrgSidPath(dcOrg.getOrgSidPath()); - } else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批 - userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); - bv.setOrgSidPath(drOrg.getOrgSidPath()); + if (candidateGroups != null && candidateGroups.size() > 0){ + userRoleQuery.setRoleSid(candidateGroups.get(0)); + if (bv.getTaskDefKey().equals("Activity_0eb1lqn")) {//调出方配件主管审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } else if (bv.getTaskDefKey().equals("Activity_0y8ofyd")) {//调入方配件主管审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); + bv.setOrgSidPath(dcOrg.getOrgSidPath()); + } else if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); + bv.setOrgSidPath(dcOrg.getOrgSidPath()); + } else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } } List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); StringBuilder nextNodeUserSids = new StringBuilder(); From 0e313e05f759c9b991a221287ff7e807492c65a3 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 16 May 2025 17:53:43 +0800 Subject: [PATCH 20/20] =?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 | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 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 fbf79bf70c..c49c61fd22 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 @@ -393,20 +393,20 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); - StringBuilder nextNodeUserSids = new StringBuilder(); - if (sysUserVos.size() > 0) { - for (SysUserVo sysUserVo : sysUserVos) { - String sid = sysUserVo.getSid(); - nextNodeUserSids.append(sid).append(","); + List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); + StringBuilder nextNodeUserSids = new StringBuilder(); + if (sysUserVos.size() > 0) { + for (SysUserVo sysUserVo : sysUserVos) { + String sid = sysUserVo.getSid(); + nextNodeUserSids.append(sid).append(","); + } + } + if (StringUtils.isBlank(nextNodeUserSids)) { + return rb.setMsg("下一环节暂无审批人员，请联系管理员"); + } else { + String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); + bv.setNextNodeUserSids(substring); } - } - if (StringUtils.isBlank(nextNodeUserSids)) { - return rb.setMsg("下一环节暂无审批人员，请联系管理员"); - } else { - String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); - bv.setNextNodeUserSids(substring); } if (bv.getTaskId().equals(wmsInventoryAllocateBill.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv);