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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 3 weeks ago
parent
29bd196180 49877aba1d
commit
1aec377a82
16 changed files with 528 additions and 183 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. 250
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 4
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java
  3. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java
  4. 164
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java
  5. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.java
  6. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.xml
  7. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehService.java
  8. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
  9. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
  10. 30
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
  11. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
  12. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateCarsSoldProfitVo.java
  13. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  14. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  15. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java
  16. 195
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java

250
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -4724,8 +4724,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String collectionDate, Voucher voucher,String userSid) {
List<Voucher.VoucherResultDetailDto> list = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> list2 = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> list3 = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> list4 = new ArrayList<>();
BigDecimal all = BigDecimal.ZERO;//赎回
BigDecimal all2 = BigDecimal.ZERO;//二次销售
BigDecimal all3 = BigDecimal.ZERO;//亏损立案
BigDecimal all4 = BigDecimal.ZERO;//亏损立案
BigDecimal otherMoney = BigDecimal.ZERO;
String payType = "";
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(finalConfirmation.getCollectionTypeKey(), "payVoucherType").getData();
@ -5243,7 +5247,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if ("预计资方结清费用".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf3.setSummary(planDetails.getVinNo()+"扣回车辆再次销售-资方结清费用");
voucherResultDetailDtoDf3.setSummary(customerNumber+"扣回车辆再次销售-资方结清费用");
voucherResultDetailDtoDf3.setSubjectNo("1201.03.01");
//核算部门
voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
@ -5270,6 +5274,104 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
) {
otherMoney = otherMoney.add(new BigDecimal(v.getSubscriptionMoney()));
}
}else if("6".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损立案
if("诉讼费".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all3 = all3.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼回款诉讼费");
voucherResultDetailDtoDf.setSubjectNo("2191.25");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list3.add(voucherResultDetailDtoDf);
}
if ("资金占用费".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
all3 = all3.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf2.setSummary(customerNumber+"诉讼回款资金占用费");
voucherResultDetailDtoDf2.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf2.setCredit(v.getSubscriptionMoney());
list3.add(voucherResultDetailDtoDf2);
//------------------------资金占用费转收入
Voucher.VoucherResultDetailDto voucherResultDetailDtoJfZjzyf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJfZjzyf.setSummary("资金占用费转收入");
voucherResultDetailDtoJfZjzyf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoJfZjzyf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJfZjzyf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJfZjzyf.setDebit(v.getSubscriptionMoney());
list3.add(voucherResultDetailDtoJfZjzyf);
//资金占用费转收入--其他业务收入_消贷收入_消贷利息
Voucher.VoucherResultDetailDto voucherResultDetailDtoDfZjzyf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDfZjzyf.setSummary("资金占用费转收入");
voucherResultDetailDtoDfZjzyf.setSubjectNo("6002.01.19");
//核算部门
voucherResultDetailDtoDfZjzyf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDfZjzyf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDfZjzyf.setCredit(v.getSubscriptionMoney());
list3.add(voucherResultDetailDtoDfZjzyf);
}
//ToDo:应收贷款车欠款_待处理欠款_处置车辆_已诉讼
}else if("7".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损执行
if("诉讼费".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary(customerNumber+"执行回款诉讼费");
voucherResultDetailDtoDf.setSubjectNo("2191.25");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDf);
}
if("资金占用费".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf2.setSummary(customerNumber+"执行回款-资金占用费");
voucherResultDetailDtoDf2.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf2.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDf2);
//------------------------资金占用费转收入
Voucher.VoucherResultDetailDto voucherResultDetailDtoJfZjzyf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJfZjzyf.setSummary("资金占用费转收入");
voucherResultDetailDtoJfZjzyf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoJfZjzyf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJfZjzyf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJfZjzyf.setDebit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoJfZjzyf);
//资金占用费转收入--其他业务收入_消贷收入_消贷利息
Voucher.VoucherResultDetailDto voucherResultDetailDtoDfZjzyf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDfZjzyf.setSummary("资金占用费转收入");
voucherResultDetailDtoDfZjzyf.setSubjectNo("6002.01.19");
//核算部门
voucherResultDetailDtoDfZjzyf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDfZjzyf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDfZjzyf.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDfZjzyf);
}
//ToDo:多收款转收入
//TodO:应收贷款车欠款_待处理欠款_待执行
}
}
@ -5308,132 +5410,46 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoJf.setDebit(String.valueOf(all2));
list2.add(voucherResultDetailDtoJf);
}
if (all3.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
}
voucherResultDetailDtoJf.setSubjectNo(payType);
voucherResultDetailDtoJf.setSummary("收款" +finalConfirmation.getPayerName()+ "（" + collectionDate + "）");
voucherResultDetailDtoJf.setDebit(String.valueOf(all3));
list3.add(voucherResultDetailDtoJf);
}
if (!list.isEmpty()) {
if (all4.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
}
voucherResultDetailDtoJf.setSubjectNo(payType);
voucherResultDetailDtoJf.setSummary("收款" +finalConfirmation.getPayerName()+ "（" + collectionDate + "）");
voucherResultDetailDtoJf.setDebit(String.valueOf(all3));
list4.add(voucherResultDetailDtoJf);
}
if (!list.isEmpty()) {//赎回收款（风控状态赎回中以及交回推送）
voucher.setResultDetails(list);
finKingDeeFeignRest.saveVoucher(voucher);
}
if (!list2.isEmpty()) {
if (!list2.isEmpty()) {//二次销售收款
voucher.setResultDetails(list2);
finKingDeeFeignRest.saveVoucher(voucher);
}
if(!list3.isEmpty()){//诉讼后法院认款
voucher.setResultDetails(list3);
finKingDeeFeignRest.saveVoucher(voucher);
}
private List<Voucher.VoucherResultDetailDto> getAll(FinCollectionConfirmation finalConfirmation, FinSelectedReceivablesDetailedVo v, String collectionDate) {
List<Voucher.VoucherResultDetailDto> list = new ArrayList<>();
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finalConfirmation.getCreateDeptSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(finUncollectedReceivablesDetailed.getBusVinSid()).getData();
String customerNumber = "";
BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
if (salesOrder != null && busSalesOrderVehicle != null) {
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeService.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
}
bdCustomer.setTOrgIds(deptVo.getOrgCode());
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
String vinNo = busSalesOrderVehicle.getLinkNo();
if (vinNo.length() > 8) {
linkNo = vinNo.substring(vinNo.length() - 8);
} else {
linkNo = busSalesOrderVehicle.getLinkNo();
}
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
}
} else {
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
}
ResultBean<String> resultBean = finKingDeeFeignRest.draftBdCustomer(bdCustomer);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
}
} else {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
}
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
String payType = "";
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(finalConfirmation.getCollectionTypeKey(), "payVoucherType").getData();
if (null != dictCommonVo) {
SysMappingListInfoQuery query = new SysMappingListInfoQuery();
query.setDictSid(dictCommonVo.getSid());
List<SysMappingInfoVo> data = sysMappingFeign.selectMappingListInfo(query).getData();
if (!data.isEmpty()) {
SysMappingInfoVo sysMappingInfoVo = data.get(0);
payType = sysMappingInfoVo.getMap_itemKey();
}
}
//--收款-赎回款(yyyy-MM-dd)
BigDecimal all = new BigDecimal(v.getSubscriptionMoney());
if (all.compareTo(BigDecimal.ZERO) != 0) {
voucherResultDetailDtoJf.setSummary("收款-赎回款" + "（" + collectionDate + "）");
voucherResultDetailDtoJf.setSubjectNo(payType);
voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
voucherResultDetailDtoJf.setDebit(all.toString());
list.add(voucherResultDetailDtoJf);
}
//-----出纳收款确认后-资金占用费
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyFeign.getAlrepaidAndArr2(finUncollectedReceivablesDetailed.getBusVinSid()).getData();
BigDecimal zjzyfMoney = BigDecimal.ZERO;
String zjzyf = alrepaidAndArrVo.getWheFundOccMoney();
zjzyfMoney = new BigDecimal(StringUtils.isBlank(zjzyf) ? "0" : zjzyf);
if (zjzyfMoney.compareTo(BigDecimal.ZERO) != 0) {
voucherResultDetailDtoDf.setSummary("收款-赎回款");
voucherResultDetailDtoDf.setSubjectNo("1201.02.03");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(zjzyfMoney.toString());
list.add(voucherResultDetailDtoDf);
voucherResultDetailDtoJf2.setSummary("资金占用费转收入");
voucherResultDetailDtoJf2.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf2.setCredit(zjzyfMoney.toString());
list.add(voucherResultDetailDtoJf2);
voucherResultDetailDtoDf3.setSummary("资金占用费转收入");
voucherResultDetailDtoDf3.setSubjectNo("6002.01.17");
//核算部门
voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf3.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf3.setCredit(zjzyfMoney.toString());
list.add(voucherResultDetailDtoDf3);
}
BigDecimal allM = BigDecimal.ZERO;
allM = all.subtract(zjzyfMoney);
if (allM.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoDf2.setSummary("收款-赎回款");
voucherResultDetailDtoDf2.setSubjectNo("1201.03.01");
//核算部门
voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf2.setCredit(allM.toString());
list.add(voucherResultDetailDtoDf2);
if(!list4.isEmpty()){//执行后法院认款
voucher.setResultDetails(list4);
finKingDeeFeignRest.saveVoucher(voucher);
}
return list;
}
//名义价其他费用推财务

4
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.reportcenter.api.carsSoldProfit;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -14,7 +15,8 @@ public class CarsSoldProfitRebateDetailsVo implements Vo {
private static final long serialVersionUID = -2059450221052046209L;
@ApiModelProperty("政策方")
private String policy;
@JsonProperty("policy")
private String policySideValue;
@ApiModelProperty("所属年月")
private String yearAndMonth;
@ApiModelProperty("返利类型")

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java
View File

@ -46,21 +46,8 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDet
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDto;
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFeign;
/**
* Project: anrui-riskcenter(案件执行立案申请) <br/>
* File: LoanCaseExecuteApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loancaseexecuteapply.LoanCaseExecuteApplyRest <br/>
* Description: 案件执行立案申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-07 10:00:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "案件执行立案申请")
@RestController("com.yxt.anrui.riskcenter.biz.loancaseexecuteapply.LoanCaseExecuteApplyRest")
@RestController
@RequestMapping("v1/loancaseexecuteapply")
public class LoanCaseExecuteApplyRest implements LoanCaseExecuteApplyFeign {

164
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java
View File

@ -31,7 +31,19 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
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.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@ -62,11 +74,15 @@ import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService;
import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService;
import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
@ -81,7 +97,9 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
@ -126,6 +144,20 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
private FlowTaskFeign flowTaskFeign;
@Autowired
private FlowFeign flowFeign;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired
private LoanRestoreReportApplyService loanRestoreReportApplyService;
@Autowired
private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
public PagerVo<LoanCaseExecuteApplyVo> listPageVo(PagerQuery<LoanCaseExecuteApplyQuery> pq) {
LoanCaseExecuteApplyQuery query = pq.getParams();
@ -495,7 +527,20 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
//推送财务凭证
//TOdO:
pushRiskToFin(bv.getBusinessSid());
});
} catch (Exception e) {
e.printStackTrace();
}
} else {
//极光推送
loanCaseExecuteApply = fetchBySid(businessSid);
@ -518,6 +563,123 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
}
}
public void pushRiskToFin(String sid){
LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(sid);
if(loanCaseExecuteApply != null){
Voucher voucher = new Voucher();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getUseOrgSid()).getData();
if (null != organizationVo) {
voucher.setAccountBook(organizationVo.getOrgCode());
voucher.setVoucherNo(organizationVo.getOrgCode());
}
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getDeptSid()).getData();
List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid());
for (int i = 0; i < busVinSidList.size(); i++) {
String busVinSid = busVinSidList.get(i);
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
String customerNumber = "";
BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
if (salesOrder != null && busSalesOrderVehicle != null) {
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
}
bdCustomer.setTOrgIds(deptVo.getOrgCode());
if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
String vinNo = busSalesOrderVehicle.getLinkNo();
if (vinNo.length() > 8) {
linkNo = vinNo.substring(vinNo.length() - 8);
} else {
linkNo = busSalesOrderVehicle.getLinkNo();
}
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
}
} else {
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
}
// bdCustomers.add(bdCustomer);
ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
}
} else {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
}
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
//应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计--不含资金占用费
BigDecimal all = BigDecimal.ZERO;
//预申请坏账金额
BigDecimal ysqhz = BigDecimal.ZERO;
//其中执行欠款金额
BigDecimal qzzxqk = BigDecimal.ZERO;
String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
all = all.add(StringUtils.isNotBlank(allMoney)?new BigDecimal(allMoney):BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney)?new BigDecimal(wdqMoney):BigDecimal.ZERO);
//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
//借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
//-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
if (all.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoDf.setSummary(customerNumber+"转执行");
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(all.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
}
//---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoJf.setSummary(customerNumber+"转执行");
voucherResultDetailDtoJf.setSubjectNo("1911.05");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(ysqhz.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJf);
}
//--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoJf2.setSummary(customerNumber+"转执行");
voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
//核算部门
voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJf2);
}
}
if (!voucherResultDetailDtos.isEmpty()) {
voucher.setResultDetails(voucherResultDetailDtos);
finKingDeeFeign.saveVoucher(voucher);
}
}
}
public ResultBean<List<LoanCaseExecuteApplyNodeVo>> getPreviousNodesForReject(LoanCaseExecuteApplyNodeQuery query) {
ResultBean<List<LoanCaseExecuteApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.java
View File

@ -27,4 +27,5 @@ public interface LoanCaseProgressVehMapper extends BaseMapper<LoanCaseProgressVe
LoanCaseProgressVeh selByMainSidAndBusVinSid(@Param("sid") String sid, @Param("busVinSid") String busVinSid);
List<String> selectByMainSid(String busSid);
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressTrialMapper.xml → anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.xml
View File

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehMapper">
<select id="selectByMainSid" resultType="java.lang.String">
select busVinSid
from loan_case_progress_veh
where mainSid = #{busSid}
</select>
</mapper>

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehService.java
View File

@ -39,4 +39,7 @@ public class LoanCaseProgressVehService extends MybatisBaseService<LoanCaseProgr
}
public List<String> selectByMainSid(String busSid) {
return baseMapper.selectByMainSid(busSid);
}
}

10
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
View File

@ -671,6 +671,16 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
e.printStackTrace();
}
}else if("二次销售".equals(loanOutboundApply.getDisposal())){
LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostService.selectMainSu(loanOutboundApply.getApplySid());
if(loanSecondarySalesCost.getIsRecovery() != null){
if(loanSecondarySalesCost.getIsRecovery() == 0){//不追偿
busVinStateSetQuery.setState(4);//不追偿
}else{//追偿
busVinStateSetQuery.setState(5);//处置损失
}
ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
}
//ToDo:
//推送金蝶财务其他出库单
try {

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
View File

@ -117,4 +117,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
String selByBusVinSidMax(String saleVehSid);
String getWdq(String busVinSid);
String selectAllMoney(String busVinSid);
}

30
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
View File

@ -1029,4 +1029,34 @@
lrpd.sid, lrpd.busVinSid, lrpd.dueMoney
) AS future_due_details
</select>
<select id="selectAllMoney" resultType="java.lang.String">
SELECT
ROUND(
SUM(ss.yq_total) +
COALESCE(lbpv_sum.bankBeInter_sum, 0),
2
) AS beMoney
FROM (
SELECT
lrpd.sid,
lrpd.busVinSid,
(lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS yq_total
FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid
WHERE lrpd.dueDate &lt;= lrpd.updateTime
AND lrpd.busVinSid = #{busVinSid}
GROUP BY lrpd.sid
) ss
LEFT JOIN (
SELECT
saleVehSid,
SUM(bankBeInter) AS bankBeInter_sum
FROM loan_be_padsincere_veh where saleVehSid =
#{busVinSid}
GROUP BY saleVehSid
) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
GROUP BY ss.busVinSid having beMoney>0
</select>
</mapper>

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
View File

@ -399,4 +399,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
public String getWdq(String busVinSid) {
return baseMapper.getWdq(busVinSid);
}
public String selectAllMoney(String busVinSid) {
return baseMapper.selectAllMoney(busVinSid);
}
}

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

@ -14,7 +14,7 @@ public class ScmVehRebateCarsSoldProfitVo implements Vo {
private static final long serialVersionUID = -5925794987523752087L;
@ApiModelProperty("政策方")
private String policy;
private String policySideValue;
@ApiModelProperty("所属年月")
private String palceGenDate;
@ApiModelProperty("返利类型")

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

@ -425,7 +425,8 @@
r.expectTreatCost,
r.expectSuppCost,
r.adjustmentMoney,
r.manufactorSettlementPrice
r.manufactorSettlementPrice,
r.policySideValue
FROM
scm_veh_rebate r
WHERE r.vehSid = #{vinSid}

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

@ -1173,6 +1173,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
scmVehRebate.setPurchaseSystemSid(scmVehRebateVeh.getPurchaseSystemSid());
scmVehRebate.setPurchaseSystemName(scmVehRebateVeh.getPurchaseSystemName());
scmVehRebate.setPolicySideKey(scmVehRebateVeh.getPolicySideKey());
scmVehRebate.setPolicySideValue(scmVehRebateVeh.getPolicySideValue());
save(scmVehRebate);
}
return rb.success().setMsg("保存成功");

4
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java
View File

@ -60,9 +60,7 @@ public class WmsInventoryAllocatebillRest {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WmsInventoryAllocateBillDtoNew dto) {
ResultBean rb = ResultBean.fireFail();
wmsInventoryAllocateBillService.saveOrUpdateDto(dto);
return rb.success();
return wmsInventoryAllocateBillService.saveOrUpdateDto(dto);
}
@ApiOperation("根据sid批量删除")

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

@ -41,6 +41,8 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
@ -171,7 +173,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
public String saveOrUpdateDto(WmsInventoryAllocateBillDtoNew dto) {
public ResultBean<String> saveOrUpdateDto(WmsInventoryAllocateBillDtoNew dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList();
if (StringUtils.isBlank(dtoSid)) {
@ -190,10 +193,19 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
dto.setCreateOrgName(sysOrganizationVo.getName());
String sid = this.insertByDto(dto);
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
if (wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().compareTo(new BigDecimal(BigInteger.ZERO)) == 0) {
deleteBySid(sid);
return rb.setMsg("所选商品成本价不能为0");
}
wmsInventoryAllocateBillDetailDtoNew.setBillSid(sid);
wmsInventoryAllocateBillDetailService.insertByDto(wmsInventoryAllocateBillDetailDtoNew);
}
return sid;
return rb.success().setData(sid);
}
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
if (wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().compareTo(new BigDecimal(BigInteger.ZERO)) == 0) {
return rb.setMsg("所选商品成本价不能为0");
}
}
this.updateByDto(dto);
wmsInventoryAllocateBillDetailService.delByMainSid(dtoSid);
@ -201,7 +213,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
wmsInventoryAllocateBillDetailDtoNew.setBillSid(dtoSid);
wmsInventoryAllocateBillDetailService.insertByDto(wmsInventoryAllocateBillDetailDtoNew);
}
return dtoSid;
return rb.success().setData(dtoSid);
}
public String insertByDto(WmsInventoryAllocateBillDtoNew dto) {
@ -231,7 +243,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
String businessSid = saveOrUpdateDto(dto);
String businessSid = saveOrUpdateDto(dto).getData();
wmsInventoryAllocateBill = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
@ -633,7 +645,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
String businessSid = saveOrUpdateDto(dto);
String businessSid = saveOrUpdateDto(dto).getData();
wmsInventoryAllocateBill = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
@ -659,7 +671,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList();
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0) {
break;
@ -667,7 +680,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1) {
break;
@ -676,15 +690,10 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
variables.put("iscdy", f0);
variables.put("isrdy", f1);
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid("bdacdca7-7a62-49b1-84c6-e32a4ffab777");
if (list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")) {
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
List<String> candidateGroups = voList.get(0).getCandidateGroups();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
} else {
userRoleQuery.setRoleSid("bdacdca7-7a62-49b1-84c6-e32a4ffab777");
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
}
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
@ -696,7 +705,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids("");
return rb.setMsg("下一环节暂无审批人员，请联系管理员");
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
@ -781,7 +790,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(businessSid);
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0) {
break;
@ -789,7 +799,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1) {
break;
@ -807,14 +818,44 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
bv.setOrgSidPath(sysOrganization.getOrgSidPath());
}
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批
//特殊处理
//获取调出方组织信息
SysOrganizationVo dcOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getOutPlatSid()).getData();
//获取调入方组织信息
SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
//流程预演
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
//获取下一环节审批角色
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
if (candidateGroups != null && candidateGroups.size() > 0) {
userRoleQuery.setRoleSid(candidateGroups.get(0));
if (bv.getTaskDefKey().equals("Activity_1kuhabd") || bv.getTaskDefKey().equals("Activity_0nhcymu")) {//调出方站长审批
if (!f0) {
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
} else {
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
bv.setOrgSidPath(dcOrg.getOrgSidPath());
}
} else if (bv.getTaskDefKey().equals("Activity_0ax87n7")) {//调出方分公司总（副总）经理审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
bv.setOrgSidPath(dcOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_1ri7ft5")) {//调出方省（分）公司总经理审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_0p4jq17")) {//调入方配件主管审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_0cuo7gz")) {//调入方站长审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_0x5oo96")) {//调入方分公司总（副总）经理审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
}
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
@ -824,7 +865,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids("");
return rb.setMsg("下一环节暂无审批人员，请联系管理员");
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
@ -885,7 +926,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid());
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0) {
break;
@ -893,7 +935,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1) {
break;
@ -932,7 +975,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid());
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0) {
break;
@ -940,7 +984,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1) {
break;
@ -994,7 +1039,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid());
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调出方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f0) {
break;
@ -1002,7 +1048,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) {
flowNodeQuery.setNodeNames("调入方站长审批");
flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString());
BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10"));
flowNodeQuery.setValue(zk.toString());
f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
if (f1) {
break;
@ -1060,7 +1107,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
String businessSid = saveOrUpdateDto(dto);
String businessSid = saveOrUpdateDto(dto).getData();
wmsInventoryAllocateBill = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
@ -1074,10 +1121,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
//是否合作二级站
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
variables.put("ishz", f1);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setType(1);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
@ -1093,6 +1143,27 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
variables.put("iscc", f0);
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid("bdacdca7-7a62-49b1-84c6-e32a4ffab777");
if (list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")) {
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
} else {
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
}
List<SysUserVo> 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);
}
//用户的部门全路径sid
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
if (sysOrganization != null) {
@ -1161,10 +1232,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
//是否合作二级站
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
variables.put("ishz", f1);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setType(1);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
@ -1190,6 +1264,44 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
bv.setOrgSidPath(sysOrganization.getOrgSidPath());
}
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
//特殊处理
//获取调入方组织信息
SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
//流程预演
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
//获取下一环节审批角色
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
if (candidateGroups != null && candidateGroups.size() > 0) {
userRoleQuery.setRoleSid(candidateGroups.get(0));
if (bv.getTaskDefKey().equals("Activity_0isr3wq")) {//一级配件主管审批
if (f1){
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
}
}else if (bv.getTaskDefKey().equals("Activity_1557g51")){//合作二级站站长审批
if (f0){
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
}
}
List<SysUserVo> 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<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -1233,10 +1345,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
//是否合作二级站
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
variables.put("ishz", f1);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setType(1);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
@ -1252,6 +1367,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
variables.put("iscc", f0);
bv.setFormVariables(variables);
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -1271,10 +1387,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
//是否合作二级站
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
variables.put("ishz", f1);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setType(1);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");
@ -1290,6 +1409,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
variables.put("iscc", f0);
bv.setFormVariables(variables);
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
@ -1324,10 +1444,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
variables.put("ishz", true);
//是否合作二级站
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue());
variables.put("ishz", f1);
//超出二级配件库存累计金额
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setType(1);
flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)");
flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName());
flowNodeQuery.setProcDefId("process_hw0a2ybh");

Write Preview
Loading…
Cancel
Save