优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -2203,9 +2203,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         File xsddspFile = new File(docPdfComponent.getUploadTemplateUrl() + xsddspUrl);
         filesList.add(xsddspFile);
         //生成金融报价单
-        String cksqSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData();
+        String ckSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData();
-        if (StringUtils.isNotBlank(cksqSid)) {
+        if (StringUtils.isNotBlank(ckSid)) {
-            String jrbjdUrl = createjrbjdPdfHB(cksqSid, baseVehicleOut1.getVinSid());
+            String jrbjdUrl = createjrbjdPdfHB(ckSid, baseVehicleOut1.getVinSid());
             if (!"1".equals(jrbjdUrl)){
                 File jrbjdFile = new File(docPdfComponent.getUploadTemplateUrl() + jrbjdUrl);
                 filesList.add(jrbjdFile);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplication.java

@@ -145,5 +145,5 @@ public class BusBillApplication extends BaseEntity {
     @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
     private String qkkpBillNo;
     @ApiModelProperty("出库申请sid")
-    private String cksqSid;
+    private String ckSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java

@@ -34,33 +34,34 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
 @ApiModel(value = "开票申请表 视图数据详情", description = "开票申请表 视图数据详情")
-public class BusBillApplicationDetailsVo extends AppBillApplicationIInfoVo implements Vo {
+public class BusBillApplicationDetailsVo implements Vo {
 
     private String sid; // sid
 
     @ApiModelProperty("创建人sid")
     private String createBySid; // 创建人sid
-	@ApiModelProperty("创建人接口")
+    @ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口
-	@ApiModelProperty("分公司sid")
+    @ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
-	@ApiModelProperty("合同sid")
+    @ApiModelProperty("合同sid")
     private String contractSid; // 合同sid
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-	@ApiModelProperty("客户sid")
+    @ApiModelProperty("客户sid")
     private String customerSid; // 客户sid
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("单台开票金额")
+    @ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
     @ApiModelProperty("单台开票状态(0空，1不为空)")
     private String oneBillState; // 单台开票状态
-	@ApiModelProperty("开票金额合计")
+    @ApiModelProperty("开票金额合计")
     private String totalBillMoney; // 开票金额合计
     @ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
@@ -142,24 +143,24 @@ public class BusBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private Boolean showValueCustomer;
 
     @ApiModelProperty("开票车辆信息")
-    private List<BusBillVehicleVo> busBillVehicles; // 开票车辆信息
+    private List<BusBillVehicleVo> finBillVehicles; // 开票车辆信息
     @ApiModelProperty("开票挂车信息")
-    private List<BusBillTrailerVo> busBillTrailers; // 开票挂车信息
+    private List<BusBillTrailerVo> finBillTrailers; // 开票挂车信息
     @ApiModelProperty("附件")
-    private List<BusBillFileVo> fjApplicationAppendxs;
+    private List<BusBillFileVo> fjApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("证件")
-    private List<BusBillFileVo> zjApplicationAppendxs; // 证件
+    private List<BusBillFileVo> zjApplicationAppendxs = new ArrayList<>(); // 证件
     @ApiModelProperty("车辆买卖合同附件信息")
-    private List<BusBillFileVo> carBuyContractImages;
+    private List<BusBillFileVo> carBuyContractImages = new ArrayList<>();
     @ApiModelProperty("客户开票申请书")
-    private List<BusBillFileVo> khkpsqsApplicationAppendxs; // 客户开票申请书
+    private List<BusBillFileVo> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书
     @ApiModelProperty("开票信息确认书")
-    private List<BusBillFileVo> kpxxqrsApplicationAppendxs; // 开票信息确认书
+    private List<BusBillFileVo> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书
     @ApiModelProperty("车辆登记合同")
-    private List<BusBillFileVo> cldjhtApplicationAppendxs; // 车辆登记合同
+    private List<BusBillFileVo> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同
     @ApiModelProperty("欠款领票附件")
     private List<BusBillFileVo> arrearsCollectionAppendxs;
 
     @ApiModelProperty("出库申请sid")
-    private String cksqSid;
+    private String ckSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java

@@ -130,9 +130,9 @@ public class BusBillApplicationDto implements Dto {
     private String ckSid;
 
     @ApiModelProperty("开票车辆信息")
-    private List<BusBillVehicleDto> busBillVehicles;
+    private List<BusBillVehicleDto> finBillVehicles;
     @ApiModelProperty("开票挂车信息")
-    private List<BusBillTrailerDto> busBillTrailers;
+    private List<BusBillTrailerDto> finBillTrailers;
     @ApiModelProperty("车辆买卖合同附件信息")
     private List<BusBillFileDto> carBuyContractImages = new ArrayList<>();
     @ApiModelProperty("客户开票申请书附件信息")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java

@@ -51,4 +51,5 @@ public interface BusBillApplicationFeign {
     @GetMapping("/fetchDetailByCkSid/{ckSid}")
     @ResponseBody
     public ResultBean<BusBillApplicationDetailsVo> fetchDetailByCkSid(@PathVariable("ckSid") String ckSid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java

@@ -102,7 +102,9 @@ public class AppDeliveredDetailsVo implements Vo {
     private String taskDefKey;
 
     private boolean showLoanUser;
-    @ApiModelProperty("是否开票（0开票，1不开票）")
+    @ApiModelProperty("是否开票（1开票，0不开票）")
-    private String isInvoicing;
+    private String hasInvoiceKey;
+    @ApiModelProperty("是否开票（1开票，0不开票）")
+    private String hasInvoice;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java

@@ -108,8 +108,10 @@ public class BusDeliveredApplyDetailVo implements Vo {
     private String distributorNameTwo;
     @ApiModelProperty("返利金额2")
     private String distributorPriceTwo;
-    @ApiModelProperty("是否开票（0开票，1不开票）")
+    @ApiModelProperty("是否开票（1开票，0不开票）")
-    private String isInvoicing;
+    private String hasInvoiceKey;
+    @ApiModelProperty("是否开票（1开票，0不开票）")
+    private String hasInvoice;
     @ApiModelProperty("开票信息")
     private BusBillApplicationDetailsVo busBillApplicationDetailsVo;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java

@@ -70,6 +70,6 @@ public interface BusBillApplicationMapper extends BaseMapper<BusBillApplication>
     @Update("update bus_bill_application set nodeState = '终止' where sid = #{businessSid}")
     void updateZZ(String businessSid);
 
-    @Select("select * from bus_bill_application where cksqSid = #{ckSid}")
+    @Select("select * from bus_bill_application where ckSid = #{ckSid}")
     BusBillApplicationVo selectByCkSid(String ckSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.busbillapplication;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
 import com.yxt.anrui.base.api.basetrailer.TrailerVo;
@@ -45,7 +46,10 @@ import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicle;
 import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleDto;
 import com.yxt.anrui.buscenter.api.busbillapplication.*;
 import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
+import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.biz.busbillfile.BusBillFileService;
 import com.yxt.anrui.buscenter.biz.busbilltrailer.BusBillTrailerService;
@@ -53,7 +57,11 @@ import com.yxt.anrui.buscenter.biz.busbillvehicle.BusBillVehicleService;
 import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication;
 import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo;
 import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo;
+import com.yxt.anrui.buscenter.biz.busdeliveredapply.BusDeliveredApplyService;
+import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
@@ -86,21 +94,26 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
     private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
     @Autowired
     private CommonAppendixFeign commonAppendixFeign;
+    @Autowired
+    private BusDeliveredApplyService busDeliveredApplyService;
+    @Autowired
+    private BusDeliveredApplyDetailsService busDeliveredApplyDetailsService;
+    @Autowired
+    private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
 
     public ResultBean<String> saveOrUpdateDto(BusBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-        List<BusBillTrailerDto> busBillTrailers = dto.getBusBillTrailers();
+        List<BusBillTrailerDto> busBillTrailers = dto.getFinBillTrailers();
-        List<BusBillVehicleDto> busBillVehicles = dto.getBusBillVehicles();
+        List<BusBillVehicleDto> busBillVehicles = dto.getFinBillVehicles();
         List<BusBillFileDto> carBuyContractImages = dto.getCarBuyContractImages();
-        List<BusBillFileDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
-        List<BusBillFileDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
         List<BusBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs();
         List<BusBillFileDto> zjApplicationAppendxs = dto.getZjApplicationAppendxs();
         if (StringUtils.isBlank(dtoSid)) {//新增
             BusBillApplication busBillApplication = new BusBillApplication();
             BeanUtil.copyProperties(dto, busBillApplication, "sid");
             busBillApplication.setNum(busBillVehicles.size());
+            busBillApplication.setArrearsMoney("0");
             save(busBillApplication);
             //主车开票信息
             for (BusBillVehicleDto busBillVehicleDto : busBillVehicles) {
@@ -130,26 +143,6 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                 busBillFileDto.setAttachType(BusAttachTypeEnum.CLMMHT.getAttachType());
                 busBillFileService.saveOrUpdateDto(busBillFileDto);
             }
-            for (BusBillFileDto busBillFileDto : khkpsqsApplicationAppendxs) {
-                String filePath = busBillFileDto.getFileUrl();
-                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
-                }
-                busBillFileDto.setFileUrl(filePath);
-                busBillFileDto.setBillAppSid(busBillApplication.getSid());
-                busBillFileDto.setAttachType(BusAttachTypeEnum.KHKPSQS.getAttachType());
-                busBillFileService.saveOrUpdateDto(busBillFileDto);
-            }
-            for (BusBillFileDto busBillFileDto : kpxxqrsApplicationAppendxs) {
-                String filePath = busBillFileDto.getFileUrl();
-                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
-                }
-                busBillFileDto.setFileUrl(filePath);
-                busBillFileDto.setBillAppSid(busBillApplication.getSid());
-                busBillFileDto.setAttachType(BusAttachTypeEnum.KPXXQRS.getAttachType());
-                busBillFileService.saveOrUpdateDto(busBillFileDto);
-            }
             for (BusBillFileDto busBillFileDto : cldjhtApplicationAppendxs) {
                 String filePath = busBillFileDto.getFileUrl();
                 if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -192,30 +185,6 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                 busBillFileService.saveOrUpdateDto(busBillFileDto);
             }
         }
-        if (khkpsqsApplicationAppendxs != null) {
-            for (BusBillFileDto busBillFileDto : khkpsqsApplicationAppendxs) {
-                String filePath = busBillFileDto.getFileUrl();
-                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
-                }
-                busBillFileDto.setFileUrl(filePath);
-                busBillFileDto.setBillAppSid(busBillApplication.getSid());
-                busBillFileDto.setAttachType(BusAttachTypeEnum.KHKPSQS.getAttachType());
-                busBillFileService.saveOrUpdateDto(busBillFileDto);
-            }
-        }
-        if (kpxxqrsApplicationAppendxs != null) {
-            for (BusBillFileDto busBillFileDto : kpxxqrsApplicationAppendxs) {
-                String filePath = busBillFileDto.getFileUrl();
-                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
-                }
-                busBillFileDto.setFileUrl(filePath);
-                busBillFileDto.setBillAppSid(busBillApplication.getSid());
-                busBillFileDto.setAttachType(BusAttachTypeEnum.KPXXQRS.getAttachType());
-                busBillFileService.saveOrUpdateDto(busBillFileDto);
-            }
-        }
         if (cldjhtApplicationAppendxs != null) {
             for (BusBillFileDto busBillFileDto : cldjhtApplicationAppendxs) {
                 String filePath = busBillFileDto.getFileUrl();
@@ -277,10 +246,56 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         baseMapper.updateById(entity);
     }
 
-    public BusBillApplicationDetailsVo fetchDetailByCkSid(String cksqSid) {
+    public BusBillApplicationDetailsVo fetchDetailByCkSid(String ckSid) {
-        BusBillApplicationVo busBillApplicationVo = baseMapper.selectByCkSid(cksqSid);
+        BusBillApplicationVo busBillApplicationVo = baseMapper.selectByCkSid(ckSid);
+        BusDeliveredApply busDeliveredApply = busDeliveredApplyService.fetchBySid(ckSid);
         if (busBillApplicationVo == null){
-            return null;
+            BusBillApplicationDetailsVo vo = new BusBillApplicationDetailsVo();
+            vo.setUseOrgSid(busDeliveredApply.getUseOrgSid());
+            vo.setSaleTypeKey(busDeliveredApply.getPaymentMethodKey());
+            vo.setSaleTypeValue(busDeliveredApply.getPaymentMethod());
+            vo.setStaffName(busDeliveredApply.getStaffName());
+            vo.setSaleDeptName(busDeliveredApply.getStaffDeptName());
+            vo.setSaleDeptSid(busDeliveredApply.getStaffDeptSid());
+            vo.setCkSid(ckSid);
+            vo.setBillStateKey("001");
+            vo.setBillStateValue("正常开票");
+            //开票单位
+            ResultBean<AppOrderDetailsVo> orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
+            AppOrderDetailsVo appOrderDetailsVo = orderDetailsVoResultBean.getData();
+            if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                if (invoicingDetailsVoResultBean.getData() != null) {
+                    vo.setOpenTickUnitName(invoicingDetailsVoResultBean.getData().getName());
+                }
+            }
+            vo.setBusSalesOrderSid(appOrderDetailsVo.getBusSalesOrderSid());
+            vo.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+            vo.setCustomerName(appOrderDetailsVo.getName());
+            vo.setContractNo(busDeliveredApply.getContractNo());
+            vo.setApplyDate(DateUtil.today());
+            vo.setCreateBySid(busDeliveredApply.getCreateBySid());
+            vo.setDeptSid(busDeliveredApply.getApplyDeptSid());
+            vo.setDeptName(busDeliveredApply.getApplyDept());
+            vo.setCreateBySid(busDeliveredApply.getApplySid());
+            vo.setCreateByName(busDeliveredApply.getApplyName());
+            //车辆信息
+            List<BusBillVehicleVo> busBillVehicleVos = new ArrayList<>();
+            List<BusDeliveredApplyDetails> busDeliveredApplyDetails = busDeliveredApplyDetailsService.selectByApplySid(ckSid);
+            for (BusDeliveredApplyDetails busDeliveredApplyDetail : busDeliveredApplyDetails) {
+                BusBillVehicleVo busBillVehicleVo = new BusBillVehicleVo();
+                busBillVehicleVo.setVinNo(busDeliveredApplyDetail.getVinNo());
+                busBillVehicleVo.setVehSid(busDeliveredApplyDetail.getVinSid());
+                //合格证状态
+                BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetail.getVinSid()).getData();
+                if (baseVehicleCertificate != null) {
+                    busBillVehicleVo.setCertificateStateKey(baseVehicleCertificate.getCertificateState());
+                    busBillVehicleVo.setCertificateStateValue(baseVehicleCertificate.getCertificateStateValue());
+                }
+                busBillVehicleVos.add(busBillVehicleVo);
+            }
+            vo.setFinBillVehicles(busBillVehicleVos);
+            return vo;
         }
         String sid = busBillApplicationVo.getSid();
         BusBillApplication entity = fetchBySid(sid);
@@ -303,7 +318,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                 }
             }
         }
-        vo.setBusBillVehicles(busBillVehicleVos);
+        vo.setFinBillVehicles(busBillVehicleVos);
         List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerService.fetchByMainSid(sid);
         if (busBillTrailerVos.size() > 0) {
             for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) {
@@ -322,7 +337,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                     busBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
                 }
             }
-            vo.setBusBillTrailers(busBillTrailerVos);
+            vo.setFinBillTrailers(busBillTrailerVos);
         }
         List<BusBillFileVo> clmmhtApplicationAppendxs = busBillFileService.fetchclmmhtBySid(sid);
         for (BusBillFileVo clmmhtApplicationAppendx : clmmhtApplicationAppendxs) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -456,7 +456,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             vo.setListVo(voList);
         }
         BusBillApplicationVo busBillApplicationVo = busBillApplicationService.selectByCkSid(sid);
-        if (busBillApplicationVo != null && "0".equals(vo.getIsInvoicing())){
+        if (busBillApplicationVo != null && "1".equals(vo.getHasInvoiceKey())){
             BusBillApplicationDetailsVo busBillApplicationDetailsVo = busBillApplicationService.fetchDetailByCkSid(busBillApplicationVo.getSid());
             vo.setBusBillApplicationDetailsVo(busBillApplicationDetailsVo);
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@@ -219,8 +219,8 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
 
     public ResultBean<String> fetchByVehSid(String vinSid) {
         ResultBean rb = ResultBean.fireFail();
-        String cksqSid = baseMapper.fetchByVehSid(vinSid);
+        String ckSid = baseMapper.fetchByVehSid(vinSid);
-        return rb.success().setData(cksqSid);
+        return rb.success().setData(ckSid);
     }
 
     public int fetchByIsDeleteVinSid(String vinSid) {

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

@@ -760,7 +760,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
                 List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
-                /*if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())){//是高低开
+                if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
                     BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
                     busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid());
                     busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName());
@@ -779,15 +779,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         vinSid = vinSid + finBillVehicleVo.getVehSid() + ",";
                         vinNo = vinNo + finBillVehicleVo.getVinNo() + ",";
                     }
-                    busValcustFilingDto.setVinSid(vinSid.substring(0,vinSid.lastIndexOf(",")));
+                    busValcustFilingDto.setVinSid(vinSid.substring(0, vinSid.lastIndexOf(",")));
-                    busValcustFilingDto.setVinNo(vinNo.substring(0,vinNo.lastIndexOf(",")));
+                    busValcustFilingDto.setVinNo(vinNo.substring(0, vinNo.lastIndexOf(",")));
                     BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice());
                     int i = money.compareTo(BigDecimal.ZERO);
-                    if (i == 1){
+                    if (i == 1) {
                         busValcustFilingDto.setIsGdk("0");
                         String parameterValue = loanParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData();
                         busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString());
-                    }else {
+                    } else {
                         busValcustFilingDto.setIsGdk("1");
                         busValcustFilingDto.setYsMoney("0");
                     }
@@ -796,79 +796,37 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     busValcustFilingDto.setBusSid(finBillApplication.getSid());
                     busValcustFilingDto.setBusSid("0");
                     busValcustFilingFeign.save(busValcustFilingDto);
-                }else {*///不是高低开
+                } else {//不是高低开
-                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
-                    int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
+                        int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
-                    if (count == 0) {
-                        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
-                        finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
-                        finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
-                        finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
-                        finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
-                        finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
-                        finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
-                        finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
-                        finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
-                        finVehicleInvoiceDto.setBillingStateKey("001");
-                        finVehicleInvoiceDto.setBillingState("未开票");
-                        finVehicleInvoiceDto.setTransferStateKey("001");
-                        finVehicleInvoiceDto.setTransferState("未移交");
-                        finVehicleInvoiceDto.setVehicleType("主车");
-                        finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
-                        finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
-                        finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                        BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
-                        if (busArrearsCarryVehicleApplyVo == null) {
-                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                        } else {
-                            finVehicleInvoiceDto.setBusinessStateKey("005");
-                            finVehicleInvoiceDto.setBusinessState("欠款提车");
-                        }
-                        finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
-                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
-                            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
-                            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
-                            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
-                            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
-                            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                        } else {
-                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
-                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
-                        }
-                        finVehicleInvoiceDto.setIsTakeTicket("是");
-                        finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
-                    }
-                }
-                if (finBillTrailerVos != null) {
-                    for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
-                        String gcVinNo = finBillTrailerVo.getGcVinNo();
-                        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
-                        int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
                         if (count == 0) {
                             FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                             finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
                             finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
                             finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
-                            finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
+                            finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
-                            finVehicleInvoiceDto.setVIN(gcVinNo);
+                            finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
-                            finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
+                            finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
-                            finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
+                            finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
-                            finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
+                            finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
                             finVehicleInvoiceDto.setBillingStateKey("001");
                             finVehicleInvoiceDto.setBillingState("未开票");
                             finVehicleInvoiceDto.setTransferStateKey("001");
                             finVehicleInvoiceDto.setTransferState("未移交");
-                            finVehicleInvoiceDto.setVehicleType("挂车");
+                            finVehicleInvoiceDto.setVehicleType("主车");
                             finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
-                            finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
+                            finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
                             finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                            BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
-                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                            if (busArrearsCarryVehicleApplyVo == null) {
+                                finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                                finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                            } else {
+                                finVehicleInvoiceDto.setBusinessStateKey("005");
+                                finVehicleInvoiceDto.setBusinessState("欠款提车");
+                            }
                             finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
+                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
                             if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
                                 finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                 finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
@@ -876,7 +834,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                 finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
                             } else {
-                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
+                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
                                 finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
                                 finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
                             }
@@ -884,12 +842,54 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                         }
                     }
+                    if (finBillTrailerVos != null) {
+                        for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                            String gcVinNo = finBillTrailerVo.getGcVinNo();
+                            BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
+                            int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
+                            if (count == 0) {
+                                FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                                finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
+                                finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
+                                finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
+                                finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
+                                finVehicleInvoiceDto.setVIN(gcVinNo);
+                                finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
+                                finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
+                                finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
+                                finVehicleInvoiceDto.setBillingStateKey("001");
+                                finVehicleInvoiceDto.setBillingState("未开票");
+                                finVehicleInvoiceDto.setTransferStateKey("001");
+                                finVehicleInvoiceDto.setTransferState("未移交");
+                                finVehicleInvoiceDto.setVehicleType("挂车");
+                                finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
+                                finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
+                                finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                                finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                                finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                                finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                                FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
+                                if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                    finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                                    finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                                    finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                                    finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                                    finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                                } else {
+                                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
+                                    finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                    finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                }
+                                finVehicleInvoiceDto.setIsTakeTicket("是");
+                                finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
+                            }
+                        }
+                    }
+                    BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+                    if (oneBillMoney == null) {
+                        busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
+                    }
                 }
-                BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                if (oneBillMoney == null) {
-                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
-                }
-                //}
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
@@ -1141,6 +1141,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             return rb.setMsg("请填写意见");
         }
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
+        if ("1".equals(busSalesOrder.getPayTypeKey())) {
+            return rb.setMsg("全款业务开票申请不允许终止");
+        }
         String businessTaskId = finBillApplication.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
             if (query.getUserSid().equals(finBillApplication.getCreateBySid())) {
@@ -2291,36 +2295,78 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     busValcustFilingDto.setBusSid("0");
                     busValcustFilingFeign.save(busValcustFilingDto);
                 } else {*///不是高低开
-                    for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
-                        int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
+                    int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
+                    if (count == 0) {
+                        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                        finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
+                        finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
+                        finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
+                        finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
+                        finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
+                        finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
+                        finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
+                        finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
+                        finVehicleInvoiceDto.setBillingStateKey("001");
+                        finVehicleInvoiceDto.setBillingState("未开票");
+                        finVehicleInvoiceDto.setTransferStateKey("001");
+                        finVehicleInvoiceDto.setTransferState("未移交");
+                        finVehicleInvoiceDto.setVehicleType("主车");
+                        finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
+                        finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
+                        finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                        BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
+                        if (busArrearsCarryVehicleApplyVo == null) {
+                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        } else {
+                            finVehicleInvoiceDto.setBusinessStateKey("005");
+                            finVehicleInvoiceDto.setBusinessState("欠款提车");
+                        }
+                        finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
+                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                        } else {
+                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
+                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                        }
+                        finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
+                        finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
+                    }
+                }
+                if (finBillTrailerVos != null) {
+                    for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                        String gcVinNo = finBillTrailerVo.getGcVinNo();
+                        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
+                        int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
                         if (count == 0) {
                             FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                             finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
                             finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
                             finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
-                            finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
+                            finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
-                            finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
+                            finVehicleInvoiceDto.setVIN(gcVinNo);
-                            finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
+                            finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
-                            finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
+                            finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
-                            finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
+                            finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
                             finVehicleInvoiceDto.setBillingStateKey("001");
                             finVehicleInvoiceDto.setBillingState("未开票");
                             finVehicleInvoiceDto.setTransferStateKey("001");
                             finVehicleInvoiceDto.setTransferState("未移交");
-                            finVehicleInvoiceDto.setVehicleType("主车");
+                            finVehicleInvoiceDto.setVehicleType("挂车");
                             finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
-                            finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
+                            finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
                             finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                            BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
+                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                            if (busArrearsCarryVehicleApplyVo == null) {
+                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                                finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                                finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                            } else {
-                                finVehicleInvoiceDto.setBusinessStateKey("005");
-                                finVehicleInvoiceDto.setBusinessState("欠款提车");
-                            }
                             finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
+                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
                             if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
                                 finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                 finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
@@ -2328,7 +2374,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                 finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
                             } else {
-                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
+                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
                                 finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
                                 finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
                             }
@@ -2336,53 +2382,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                         }
                     }
-                    if (finBillTrailerVos != null) {
+                }
-                        for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                            String gcVinNo = finBillTrailerVo.getGcVinNo();
+                if (oneBillMoney == null) {
-                            BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
-                            int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
+                }
-                            if (count == 0) {
-                                FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
-                                finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
-                                finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
-                                finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
-                                finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
-                                finVehicleInvoiceDto.setVIN(gcVinNo);
-                                finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
-                                finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
-                                finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
-                                finVehicleInvoiceDto.setBillingStateKey("001");
-                                finVehicleInvoiceDto.setBillingState("未开票");
-                                finVehicleInvoiceDto.setTransferStateKey("001");
-                                finVehicleInvoiceDto.setTransferState("未移交");
-                                finVehicleInvoiceDto.setVehicleType("挂车");
-                                finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
-                                finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
-                                finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
-                                finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
-                                finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                                finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                                FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
-                                if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
-                                    finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
-                                    finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
-                                    finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
-                                    finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
-                                    finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                                } else {
-                                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
-                                    finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                    finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
-                                }
-                                finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
-                                finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
-                            }
-                        }
-                    }
-                    BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                    if (oneBillMoney == null) {
-                        busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
-                    }
                 //}
             } else {
                 //极光推送

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

@@ -51,7 +51,7 @@ public enum ProcDefEnum {
     BUSHANDOVER("交车确认", "process_e8feloik:6:2675004"),
     LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"),
     LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),
-    LOANCREDITAPPEALAPPLY("信用审核申诉", "process_gygvxw8k:1:2847504"),
+    LOANCREDITAPPEALAPPLY("信用审核申诉", "process_gygvxw8k:2:5212504"),
     DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:6:4827504"),
     LOANTEMPLATEAPPLY("定制金融方案", "process_9q5omebi:2:2685008"),
     LOANHOMEVISITAPPEALAPPLY("家访考察申诉", "process_8ujil3h3:1:3665004"),

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java

@@ -471,6 +471,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         //=======================================
         bv.setFormVariables(variables);
         bv.setOrgSidPath(loanCreditAppealApply.getOrgSidPath());
+        bv.setModelId(loanCreditAppealApply.getProcDefId());
         if (bv.getTaskId().equals(loanCreditAppealApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -506,7 +507,8 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         ResultBean<List<LoanCreditApplyNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-        bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
+        LoanCreditAppealApply loanCreditAppealApply = fetchBySid(query.getBusinessSid());
+        bv.setModelId(loanCreditAppealApply.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<LoanCreditApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCreditApplyNodeVo.class)).collect(Collectors.toList());
@@ -517,7 +519,8 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         ResultBean<List<LoanCreditApplyNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-        bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
+        LoanCreditAppealApply loanCreditAppealApply = fetchBySid(query.getBusinessSid());
+        bv.setModelId(loanCreditAppealApply.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<LoanCreditApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCreditApplyNodeVo.class)).collect(Collectors.toList());