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 2 years ago
parent
e8d9717d78 d7a279d1b4
commit
de92f2aced
14 changed files with 164 additions and 130 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. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  2. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  3. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  4. 23
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  5. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  6. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  7. 50
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  8. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
  9. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  10. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  11. 2
      anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
  12. 56
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  13. 11
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  14. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -564,8 +564,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -665,8 +665,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -720,8 +720,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(baseInternalPurchase.getProcInstId());
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -795,16 +795,18 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseInternalPurchase.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("分公司间调车申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
View File

@ -356,8 +356,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseModelModprice.getProcInstId());
ufVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowVo.setProcInsId(baseModelModprice.getProcInstId());
messageFlowVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -428,16 +428,18 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseModelModprice.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("车型调价申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -37,14 +37,12 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
@ -495,7 +493,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -503,7 +501,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("外采申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
//======================添加消息推送结束
return resultBean1;
} else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
@ -519,8 +516,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
uff.setProcDefId(baseOutsourcingApplication.getProcDefId());
messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowVo.setProcDefId(baseOutsourcingApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -528,7 +525,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("外采申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
//======================添加消息推送结束
return rb;
} else {
@ -612,7 +608,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowVo.setProcInsId(baseOutsourcingApplication.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -815,15 +811,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(data, messageFlowVo);
String procId = baseOutsourcingApplication.getProcInstSid();
data.setProcInsId(procId);
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseOutsourcingApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());
messageFlowableQuery.setModuleName("外采申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@ -831,7 +830,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
messageFlowableQuery.setMsgTitle("外采申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(data, appMap, baseOutsourcingApplication);
//======================添加消息推送结束
return resultBean;
} else {

23
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
View File

@ -497,8 +497,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
ufVo.setProcInsId(baseVehicleActualSales.getProcInstId());
messageFlowVo.setProcDefId(baseVehicleActualSales.getProcDefId());
messageFlowVo.setProcInsId(baseVehicleActualSales.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -623,16 +623,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseVehicleActualSales.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseVehicleActualSales.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("未售买断申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
if ("未售买断申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
//更新未售买断状态为未买断
//更新车辆状态为未买断
@ -675,12 +677,21 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) {
baseVehicleActualSales = fetchBySid(query.getBusinessSid());
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(baseVehicleActualSales.getProcInstId());
String nextName = listResultBean.getData().get(0).getName_();
if ("未售买断申请".equals(nextName)) {
//更新车辆状态为未买断
String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
}
/*if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) {
//更新车辆状态为未买断
String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
}*/
return rb.success().setData(resultBean.getData());
}
}

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
View File

@ -611,8 +611,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(busVehicleApply.getProcDefId());
ufVo.setProcInsId(busVehicleApply.getProcInstId());
messageFlowVo.setProcDefId(busVehicleApply.getProcDefId());
messageFlowVo.setProcInsId(busVehicleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -725,16 +725,18 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = busVehicleApply.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(busVehicleApply.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(busVehicleApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("厂家采购申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextName = listResultBean.getData().get(0).getName_();
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

16
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -2256,8 +2256,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(busMainDeposit.get().getProcInsId());
ufVo.setProcDefId(busMainDeposit.get().getProcDefId());
messageFlowVo.setProcInsId(busMainDeposit.get().getProcInsId());
messageFlowVo.setProcDefId(busMainDeposit.get().getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
@ -2268,8 +2268,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
}
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
if ("销售专员申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@ -2280,8 +2282,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
Future future2 = pool.submit(() -> {
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
if ("销售专员申请".equals(nextName)) {
//更新已选择的车架号的状态为未锁定
AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
@ -2323,9 +2327,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
String procId = busMainDeposit.getProcInsId();
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
if ("销售专员申请".equals(nextName)) {
//更新已选择的车架号的状态为未锁定
AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
if (appBusDepositVehicleDetailVo != null) {

50
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -1184,8 +1184,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String procId1 = busSalesOrder1.getProcInstId();
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId1);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getCreateBySid())) {
if ("销售订单申请".equals(nextName)) {
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if ("现车".equals(vo.getOrderType())) {
@ -1210,28 +1212,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
busSalesOrder.set(fetchBySid(query.getBusinessSid()));
String procId = busSalesOrder.get().getProcInstId();
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(procId);
messageFlowVo.setProcInsId(procId1);
messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("销售订单申请");
ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId);
ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId1);
String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(","));
if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getCreateBySid())) {
String nextName2 = listResultBean2.getData().get(0).getName_();
// if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getCreateBySid())) {
if ("销售订单申请".equals(nextName2)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@ -1239,29 +1236,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
messageFlowableQuery.setMsgTitle("销售订单");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
/*Future future2 = pool.submit(() -> {
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.get().getStaffSid())) {
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if ("现车".equals(vo.getOrderType())) {
//更新已选择的车架号的状态为未锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid());
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
busMainDepositUpdateQuery.setVinSidList(list);
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
}
}
});*/
} catch (Exception e) {
e.printStackTrace();
}
return rb.success();
@ -1367,8 +1341,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String procId = busSalesOrder.getProcInstId();
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getCreateBySid())) {
if ("销售订单申请".equals(nextName)) {
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if ("现车".equals(vo.getOrderType())) {

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
View File

@ -70,4 +70,6 @@ public class FinUncollectedReceivablesDetailedQuery implements Query {
private String createBySid; // 业务员sid
@ApiModelProperty("应收款项sid")
private String[] sids; // 应收款项sid
private String vinNo;
}

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

@ -328,6 +328,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//设置审核状态为待审核(1待审核/2已驳回/3已审核)
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
//认款日期默认为当天的日期
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
@ -1183,6 +1185,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String vinNo = resultBean.getData().getLinkNo();
String vinSid = resultBean.getData().getLinkSid();
record.setVin(vinNo);
if(StringUtils.isNotBlank(vinNo)){
record.setVin(vinNo.substring(vinNo.length()-8));
}
}
}
return collectionConfirmList;

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
View File

@ -32,7 +32,6 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
@ -185,9 +184,15 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
String vinNo = resultBean.getData().getLinkNo();
String vinSid = resultBean.getData().getLinkSid();
v.setVIN(vinNo);
if(StringUtils.isNotBlank(vinNo)){
v.setVIN(vinNo.substring(vinNo.length()-8));
}
}
}
}
if(StringUtils.isNotBlank(query.getVinNo())){
list = list.stream().filter(v->v.getVIN().contains(query.getVinNo())).collect(Collectors.toList());
}
return list;
}

2
anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
View File

@ -26,7 +26,7 @@ image:
prefix: http://anrui.yyundong.com/upload/
kingdee:
acctID: 61dce6601125a0 #登录金蝶的账户信息 2022010测试
userName: 信息部2 #登录金蝶的账户信息 2022010测试的
userName: 信息部 #登录金蝶的账户信息 2022010测试的
password: 123321 #登录金蝶的账户信息
userName_administrator: administrator #登录金蝶的账户信息 2022010测试
password_administrator: ANrui123456. #登录金蝶的账户信息 2022010测试

56
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -7,28 +7,27 @@ public enum ProcDefEnum {
/***************************正式流程id***********************************/
ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
/*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
// CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
// SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
// FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
// VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),//TODO：正式新2022-11-25
// SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), //TODO：正式新2022-11-25
// BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),//ToDo：正式新2022-11-25
// FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),//ToDo:正式新2022-11-25
// FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),//ToDo:正式新2022-11-25
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),//TODO：正式新2022-11-25
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), //TODO：正式新2022-11-25
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),//ToDo：正式新2022-11-25
FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),//ToDo:正式新2022-11-25
FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),//ToDo:正式新2022-11-25
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
// SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
// BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25
// BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25
// BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25
// BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"), //ToDo:正式新2022-11-25
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"),
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"), //ToDo:正式新2022-11-25
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:3:770004"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
@ -39,23 +38,42 @@ public enum ProcDefEnum {
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
/******************************测试流程id*********************************************/
ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"),
SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"),
SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"),
SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"),
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:910004"),//TODO:测试
FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试
FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试
FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:2:937504"),//测试（新）2022、11、22
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id*/
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id
;

11
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
View File

@ -1112,15 +1112,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = scmVehicleGression.getProcInstId();
ufVo.setProcInsId(procId);
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(scmVehicleGression.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("存放地点变更申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
//清除临时车辆表状态
baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
@ -1163,8 +1166,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
String procId = scmVehicleGression.getProcInstId();
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
//清除临时车辆表状态
baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
}

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
View File

@ -314,8 +314,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(scmVehicleReturn.getInstanceId());
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowVo.setProcInsId(scmVehicleReturn.getInstanceId());
messageFlowVo.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -421,8 +421,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(scmVehicleReturn.getInstanceId());
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowVo.setProcInsId(scmVehicleReturn.getInstanceId());
messageFlowVo.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -750,7 +750,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
stringObjectMap.put("procInstSid", boad.getInstanceId());
stringObjectMap.put("procDefId", boad.getProcDefId());
stringObjectMap.put("nodeState", data.getNodeState());
if (data.getNodeState().equals("采购退库申请")){
if (data.getNodeState().equals("发起申请")){
List<ScmVehicleReturnDetails> scmVehicleReturnDetails = scmVehicleReturnDetailsService.selectByReturnSid(flowTaskVo.getBusinessSid());
List<BaseVehicleDto> baseVehicleDtos = new ArrayList<>();
for (ScmVehicleReturnDetails scmVehicleReturnDetail : scmVehicleReturnDetails) {
@ -771,16 +771,18 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
String procId = scmVehicleReturn.getInstanceId();
uff.setProcInsId(procId);
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());
messageFlowableQuery.setModuleName("采购退库申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleReturn.getCreateBySid())) {
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleReturn.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

Write Preview
Loading…
Cancel
Save