yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 3 weeks ago
parent
8ee78175a7 e653506768
commit
1791339470
6 changed files with 320 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java
  2. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  3. 3
      anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateTypeByDetail.vue
  4. 248
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
  5. 21
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java
  6. 59
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateTypeStatVo.java
View File

@ -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("预计待支付费用")

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
View File

@ -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,

3
anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateTypeByDetail.vue
View File

@ -63,11 +63,12 @@
<el-table-column label="未上传" align="center">
<el-table-column prop="notUploadMoney" label="合计" align="center" width="120" />
<el-table-column label="其中费用" align="center">
<el-table-column prop="moneyTotal" label="合计" align="center" width="120" />
<el-table-column prop="expectItureCost" label="支出" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="待支付" align="center" width="120" />
<el-table-column prop="expectSuppCost" label="抵顶" align="center" width="120" />
</el-table-column>
<el-table-column prop="balance" label="剩余" align="center" width="120" />
<el-table-column prop="balance" label="其中返利" align="center" width="120" />
</el-table-column>
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="useOrgName" label="分公司" align="center" width="120" />

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

@ -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<WmsInven
private MessageFeign messageFeign;
@Autowired
private SysUserRoleFeign sysUserRoleFeign;
@Autowired
private SysFlowPowerFeign sysFlowPowerFeign;
public PagerVo<WmsInventoryAllocateBillVoNew> listPageVo(PagerQuery<WmsInventoryAllocateBillQueryNew> pq) {
WmsInventoryAllocateBillQueryNew query = pq.getParams();
@ -646,6 +650,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
//成本折扣价
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<WmsInventoryAllocateBillDetailDtoNew> 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<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
@ -740,8 +772,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("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<WmsInventoryAllocatebillDetailDetailsVoNew> 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<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
@ -817,8 +875,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("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<WmsInventoryAllocatebillDetailDetailsVoNew> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -838,8 +922,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("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<WmsInventoryAllocatebillDetailDetailsVoNew> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -873,8 +983,34 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("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<WmsInventoryAllocatebillDetailDetailsVoNew> 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<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@ -939,7 +1075,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> 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<WmsInventoryAllocateBillDetailDtoNew> 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<WmsInven
List<String> 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<WmsInventoryAllocatebillDetailDetailsVoNew> 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<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
@ -1063,7 +1233,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> 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<WmsInventoryAllocatebillDetailDetailsVoNew> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -1084,7 +1271,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> 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<WmsInventoryAllocatebillDetailDetailsVoNew> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -1119,7 +1323,24 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<String> 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<WmsInventoryAllocatebillDetailDetailsVoNew> 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<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@ -1149,7 +1370,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
} else {
messageFlowableQuery.setMsgContent(wmsInventoryAllocateBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("调拨申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();

21
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowNodeQuery.java
View File

@ -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是否大于权限范围
}

59
yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysflowpower/SysFlowPowerFeign.java
View File

@ -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(流程权限) <br/>
* File: SysFlowPowerFeign.java <br/>
* Class: com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerFeign <br/>
* Description: 流程权限. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-27 14:31:01 <br/>
*
* @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);
}
Write Preview
Loading…
Cancel
Save