Browse Source

优化

master
dimengzhe 2 years ago
parent
commit
9ad5f6c5b0
  1. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  2. 7
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@ -675,6 +675,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
record.setPaymentState("待确认");
}
}
if(!"0".equals(useDepositMoney)){
record.setShowDepositBtn(true);
}
}
record.setCarNumber(vo.getCarNumber());
} else if (record.getVirtualOrderType().equals("02")) {
@ -695,12 +698,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
record.setShowDeleteBtn(false);
record.setShowUpdateBtn(false);
}
List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderSid());
/* List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderSid());
if (depositRecords.size() > 0) {
record.setShowDepositBtn(true);
} else {
record.setShowDepositBtn(false);
}
}*/
if ("收款确认".equals(record.getVirtualOrderState())) {
record.setShowApplyBtn(true);
} else {

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

@ -14,20 +14,15 @@ public enum ProcDefEnum {
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
//FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:3:2430004"),
//QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
//QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"),
//QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"),
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:4:1865016"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"),
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"),
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
//RECORDAPPLICATION("入库申请", "process_xbwq2c7p:4:1232504"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),

Loading…
Cancel
Save