优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java

@@ -207,6 +207,23 @@ public class BaseModelConfig extends BaseEntity {
     @ApiModelProperty("蓄电池value")
     private String storagBatteryValue;
 
+    @ApiModelProperty("舒适包key")
+    private String comfortPackKey;
+    @ApiModelProperty("舒适包value")
+    private String comfortPackValue;
+    @ApiModelProperty("危化品基础包key")
+    private String cheBasePackKey;
+    @ApiModelProperty("危化品基础包value")
+    private String cheBasePackValue;
+    @ApiModelProperty("节油包key")
+    private String savingPackKey;
+    @ApiModelProperty("节油包value")
+    private String savingPackValue;
+    @ApiModelProperty("便捷包key")
+    private String conPackKey;
+    @ApiModelProperty("便捷包value")
+    private String conPackValue;
+
     @ApiModelProperty("品牌名称")
     private String brandName;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java

@@ -208,6 +208,22 @@ public class BaseModelConfigDto implements Dto {
     private String storagBatteryKey;
     @ApiModelProperty("蓄电池value")
     private String storagBatteryValue;
+    @ApiModelProperty("舒适包key")
+    private String comfortPackKey;
+    @ApiModelProperty("舒适包value")
+    private String comfortPackValue;
+    @ApiModelProperty("危化品基础包key")
+    private String cheBasePackKey;
+    @ApiModelProperty("危化品基础包value")
+    private String cheBasePackValue;
+    @ApiModelProperty("节油包key")
+    private String savingPackKey;
+    @ApiModelProperty("节油包value")
+    private String savingPackValue;
+    @ApiModelProperty("便捷包key")
+    private String conPackKey;
+    @ApiModelProperty("便捷包value")
+    private String conPackValue;
 
     @ApiModelProperty("品牌名称")
     private String brandName;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java

@@ -187,6 +187,22 @@ public class BaseModelConfigSelectVo implements Vo {
     private String storagBatteryKey;
     @ApiModelProperty("蓄电池value")
     private String storagBatteryValue;
+    @ApiModelProperty("舒适包key")
+    private String comfortPackKey;
+    @ApiModelProperty("舒适包value")
+    private String comfortPackValue;
+    @ApiModelProperty("危化品基础包key")
+    private String cheBasePackKey;
+    @ApiModelProperty("危化品基础包value")
+    private String cheBasePackValue;
+    @ApiModelProperty("节油包key")
+    private String savingPackKey;
+    @ApiModelProperty("节油包value")
+    private String savingPackValue;
+    @ApiModelProperty("便捷包key")
+    private String conPackKey;
+    @ApiModelProperty("便捷包value")
+    private String conPackValue;
 
     @ApiModelProperty("品牌名称")
     private String brandName;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java

@@ -147,6 +147,22 @@ public class BaseModelConfigVo implements Vo {
     private String storagBatteryKey;
     @ApiModelProperty("蓄电池value")
     private String storagBatteryValue;
+    @ApiModelProperty("舒适包key")
+    private String comfortPackKey;
+    @ApiModelProperty("舒适包value")
+    private String comfortPackValue;
+    @ApiModelProperty("危化品基础包key")
+    private String cheBasePackKey;
+    @ApiModelProperty("危化品基础包value")
+    private String cheBasePackValue;
+    @ApiModelProperty("节油包key")
+    private String savingPackKey;
+    @ApiModelProperty("节油包value")
+    private String savingPackValue;
+    @ApiModelProperty("便捷包key")
+    private String conPackKey;
+    @ApiModelProperty("便捷包value")
+    private String conPackValue;
     @ApiModelProperty("品牌名称")
     private String brandName;
     @ApiModelProperty("是否可以删除（1是，0否）")

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

@@ -144,6 +144,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean<PdfPath> createjrbjdPdf(String sid) {
         ResultBean rb = ResultBean.fireFail();
         PdfPath pdf = baseVehicleOutService.createjrbjdPdf(sid);
+        if ("1".equals(pdf.getPdfPath())){
+            return rb.setMsg("申请单车辆中缺少消贷合同信息");
+        }
         return rb.success().setData(pdf);
     }
 }

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

@@ -2202,8 +2202,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         String cksqSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData();
         if (StringUtils.isNotBlank(cksqSid)) {
             String jrbjdUrl = createjrbjdPdfHB(cksqSid, baseVehicleOut1.getVinSid());
-            File jrbjdFile = new File(docPdfComponent.getUploadTemplateUrl() + jrbjdUrl);
-            filesList.add(jrbjdFile);
+            if (!"1".equals(jrbjdUrl)){
+                File jrbjdFile = new File(docPdfComponent.getUploadTemplateUrl() + jrbjdUrl);
+                filesList.add(jrbjdFile);
+            }
         }
         String hbName = "销售出库单_金融报价单_销售订单审批" + ".pdf";
         try {
@@ -2340,6 +2342,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //销售人员
         baseQuotationVo.setStaffName(busSalesOrder.getStaffName());
         //销售消贷合同信息
+        if (StringUtils.isBlank(busSalesOrderVehicle.getLoanContractSid())){
+            return rb.setMsg("该车辆没有消贷合同信息");
+        }
         BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(busSalesOrderVehicle.getLoanContractSid()).getData();
         //贷款合同编号
         baseQuotationVo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
@@ -2419,9 +2424,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     }
 
     public PdfPath createjrbjdPdf(String sid) {
-        BaseQuotationVo baseQuotationVo = selectQuotation(sid).getData();
-        BaseJRFAVo baseJRFAVo = baseQuotationVo.getBaseJRFAVo();
         PdfPath pdfPath = new PdfPath();
+        ResultBean<BaseQuotationVo> resultBean = selectQuotation(sid);
+        if (!resultBean.getSuccess()) {
+            pdfPath.setPdfPath("1");
+            return pdfPath;
+        }
+        BaseQuotationVo baseQuotationVo = resultBean.getData();
+        BaseJRFAVo baseJRFAVo = baseQuotationVo.getBaseJRFAVo();
         //查询出库申请
         BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(sid).getData();
         //查询出库申请车辆表
@@ -2559,7 +2569,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     }
 
     public String createjrbjdPdfHB(String sid, String vehSid) {
-        BaseQuotationVo baseQuotationVo = selectQuotation(sid).getData();
+        ResultBean<BaseQuotationVo> resultBean = selectQuotation(sid);
+        if (!resultBean.getSuccess()) {
+            return "1";
+        }
+        BaseQuotationVo baseQuotationVo = resultBean.getData();
         BaseJRFAVo baseJRFAVo = baseQuotationVo.getBaseJRFAVo();
         //查询车辆信息
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
 
+import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -109,4 +110,6 @@ public class BusDeliveredApplyDetailVo implements Vo {
     private String distributorPriceTwo;
     @ApiModelProperty("是否开票（0开票，1不开票）")
     private String isInvoicing;
+    @ApiModelProperty("开票信息")
+    private BusBillApplicationDetailsVo busBillApplicationDetailsVo;
 }

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

@@ -396,4 +396,8 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         busBillFileService.deleteByFinAppSid(busBillApplicationVo.getSid());
         return rb.success();
     }
+
+    public BusBillApplicationVo selectByCkSid(String sid) {
+        return baseMapper.selectByCkSid(sid);
+    }
 }

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

@@ -52,7 +52,9 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.CertificState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
+import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo;
 import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto;
+import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationVo;
 import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
 import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
@@ -453,6 +455,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             vo.setListVo(voList);
         }
+        BusBillApplicationVo busBillApplicationVo = busBillApplicationService.selectByCkSid(sid);
+        if (busBillApplicationVo != null && "0".equals(vo.getIsInvoicing())){
+            BusBillApplicationDetailsVo busBillApplicationDetailsVo = busBillApplicationService.fetchDetailsVoBySid(busBillApplicationVo.getSid());
+            vo.setBusBillApplicationDetailsVo(busBillApplicationDetailsVo);
+        }
         return rb.success().setData(vo);
     }