Browse Source

款项结转模块优化

master
God 2 years ago
parent
commit
465526686c
  1. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
  2. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  3. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  4. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@ -155,6 +155,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
private String taskId;
@ApiModelProperty(value = "当前用户部门全路径")
private String orgSidPath;
@ApiModelProperty("是否显示价值客户")
private Boolean showValueCustomer;
@ApiModelProperty("开票车辆信息")
private List<FinBillVehicleVo> finBillVehicles; // 开票车辆信息

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -636,6 +636,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
vo.setZjApplicationAppendxs(zjApplicationAppendxs);
vo.setFjApplicationAppendxs(fjApplicationAppendxs);
vo.setArrearsCollectionAppendxs(arrearsCollectionAppendxs);
//判断是否是高低开,若是,则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) {
vo.setShowValueCustomer(!data.getSingleFinalPrice().equals(entity.getOneBillMoney()));
}
return vo;
}

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -15,7 +15,7 @@ public enum ProcDefEnum {
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
//FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:2:1592504"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:3:2430004"),
//QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
//QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"),

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@ -83,4 +83,6 @@ public class BillApplicationIInfoVo implements Vo {
private String modelName; // 车型名称
@ApiModelProperty("销售订单sid")
private String busSalesOrderSid;
@ApiModelProperty("是否显示价值客户")
private Boolean showValueCustomer;
}

Loading…
Cancel
Save