贷款出库开票优化

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

@@ -106,6 +106,8 @@ public class AppDeliveredDetailsVo implements Vo {
     private String hasInvoiceKey;
     @ApiModelProperty("是否开票（1开票，0不开票）")
     private String hasInvoice;
+    @ApiModelProperty("是否开过票（1开票,0未开票）")
+    private int isKp;
 
     @ApiModelProperty("是否开票是否有禁止修改")
     private boolean forbidInvoiceChoice;

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

@@ -63,6 +63,9 @@ public class BusDeliveredVo implements Vo {
     private String busVinSid;
     @ApiModelProperty("车辆sid")
     private String vinSid;
+
+    @ApiModelProperty("销售类型key")
+    private String paymentMethodKey;
     @ApiModelProperty("销售类型")
     private String paymentMethod;
 
@@ -78,5 +81,6 @@ public class BusDeliveredVo implements Vo {
     private String loanName;
     private String loanSid;
 
-
+    @ApiModelProperty("开票/未开票")
+    private String isKp;
 }

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

@@ -131,4 +131,6 @@ public class BusDeliveredApply extends BaseEntity {
     private String promiseFile;
     private String danFile;
     private String carFile;
+    @ApiModelProperty("是否开过票（1开票,0未开票）")
+    private int isKp;
 }

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

@@ -112,6 +112,8 @@ public class BusDeliveredApplyDetailVo implements Vo {
     private String hasInvoiceKey;
     @ApiModelProperty("是否开票（1开票，0不开票）")
     private String hasInvoice;
+    @ApiModelProperty("是否开过票（1开票,0未开票）")
+    private int isKp;
     @ApiModelProperty("开票信息")
     private BusBillApplicationDetailsVo busBillApplicationDetailsVo;
 }

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

@@ -105,6 +105,8 @@ public class BusDeliveredApplyDto implements Dto {
     private String distributorPriceTwo;
     @ApiModelProperty("是否开票（0开票，1不开票）")
     private String isInvoicing;
+    @ApiModelProperty("是否开过票（1开票,0未开票）")
+    private int isKp;
     @ApiModelProperty("开票信息")
     private BusBillApplicationDto busBillApplicationDto;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -284,16 +284,19 @@
         bo.contractNo,
         bo.customerName as name,
         bo.payType paymentMethod,
+        bo.payTypeKey as paymentMethodKey,
         RIGHT(bv.linkNo, 8) as vinNo,
         bv.linkSid vinSid,
         bv.sid busVinSid,
         bv.borrowName loanName,
-        bv.borrowerSid loanSid
+        bv.borrowerSid loanSid,
+        IF(fi.VIN IS NULL,'0','1') AS isKp
         FROM
         bus_sales_order bo
         LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
         LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
         LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
+        LEFT JOIN anrui_fin.fin_vehicle_invoice fi ON bv.linkSid = fi.vehicleSid
         <where>
             ${ew.sqlSegment}
             and length(bv.linkSid) > 0

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -62,6 +62,8 @@ import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerSe
 import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -142,6 +144,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
     private BusBillApplicationService busBillApplicationService;
     @Autowired
     private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
+    @Autowired
+    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
 
     /**
      * 待出库车辆分页列表
@@ -457,6 +461,13 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             //根据合同编号和车辆sid查询
             for (int i = 0; i < list.size(); i++) {
                 String vinSid = list.get(i);
+                //判断车辆是否开过票
+                FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(vinSid, contractNo).getData();
+                if (StringUtils.isBlank(finVehicleInvoice.getVIN())){
+                    appDeliveredDetailsVo.setIsKp(0);
+                }else {
+                    appDeliveredDetailsVo.setIsKp(1);
+                }
                 //根据合同编号和车辆sid查询销售订单的车辆信息
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid);
                 AppCarListVo appCarListVo = new AppCarListVo();

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

@@ -151,6 +151,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
 import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
@@ -284,6 +285,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     @Autowired
     private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
     @Autowired
+    private LoanHomevisitFileexamineFeign loanHomevisitFileexamineFeign;
+    @Autowired
     private LoanNoGuaranteeCreditReviewFeign loanNoGuaranteeCreditReviewFeign;
     @Autowired
     private BusSalesOrderLoancontractService busSalesOrderLoancontractService;
@@ -413,6 +416,27 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+            if ("2".equals(dto.getPaymentMethodKey()) && "1".equals(dto.getIsInvoicing())){
+                List<BusDeliveredApplyDetailsDto> detailsList = dto.getDetailsList();
+                for (BusDeliveredApplyDetailsDto busDeliveredApplyDetailsDto : detailsList) {
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractNo(), busDeliveredApplyDetailsDto.getVinSid());
+                    BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData();
+                    if (!"1".equals(baseVehicleState.getFinState())){
+                        return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "款项未交清，保存失败");
+                    }
+                    if ("3".equals(baseVehicleState.getFinSourceKey())){//非担保
+                        String investigateValue = loanHomevisitInvestigateFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+                        if (!"通过".equals(investigateValue)){
+                            return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访考察未通过，保存失败");
+                        }
+                    }else if ("4".equals(baseVehicleState.getFinSourceKey())){//担保
+                        String state = loanHomevisitFileexamineFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+                        if (!"2".equals(state)){
+                            return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访资料审核未通过，保存失败");
+                        }
+                    }
+                }
+            }
             //新增
             BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
@@ -856,6 +880,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
         //判断是否为贷款业务
         variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey()));
+        //判断贷款业务是否开票
+        if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "1".equals(busDeliveredApply.getHasInvoiceKey())){
+            variables.put("isKp", true);
+        }else if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "0".equals(busDeliveredApply.getHasInvoiceKey())){
+            variables.put("isKp", false);
+        }
         //若app移动端有此功能，则传递appMap参数
         Map<String, Object> appMap = new HashMap<>();
         //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@@ -2128,6 +2158,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
             //判断是否为贷款业务
             variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey()));
+            //判断贷款业务是否开票
+            if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "1".equals(busDeliveredApply.getHasInvoiceKey())){
+                variables.put("isKp", true);
+            }else if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "0".equals(busDeliveredApply.getHasInvoiceKey())){
+                variables.put("isKp", false);
+            }
             //若app移动端有此功能，则传递appMap参数
             Map<String, Object> appMap = new HashMap<>();
             //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@@ -2192,6 +2228,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
             //判断是否为贷款业务
             variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey()));
+            //判断贷款业务是否开票
+            if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "1".equals(busDeliveredApply.getHasInvoiceKey())){
+                variables.put("isKp", true);
+            }else if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "0".equals(busDeliveredApply.getHasInvoiceKey())){
+                variables.put("isKp", false);
+            }
             //若app移动端有此功能，则传递appMap参数
             Map<String, Object> appMap = new HashMap<>();
             //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@@ -2259,6 +2301,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
                 //判断是否为贷款业务
                 variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey()));
+                //判断贷款业务是否开票
+                if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "1".equals(busDeliveredApply.getHasInvoiceKey())){
+                    variables.put("isKp", true);
+                }else if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "0".equals(busDeliveredApply.getHasInvoiceKey())){
+                    variables.put("isKp", false);
+                }
                 //若app移动端有此功能，则传递appMap参数
                 Map<String, Object> appMap = new HashMap<>();
                 //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@@ -3320,6 +3368,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
         //判断是否为贷款业务
         variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey()));
+        //判断贷款业务是否开票
+        if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "1".equals(busDeliveredApply.getHasInvoiceKey())){
+            variables.put("isKp", true);
+        }else if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && "0".equals(busDeliveredApply.getHasInvoiceKey())){
+            variables.put("isKp", false);
+        }
         //若app移动端有此功能，则传递appMap参数
         Map<String, Object> appMap = new HashMap<>();
         //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。

anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl

@@ -578,7 +578,7 @@
                         <w:sz w:val="24"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>       </w:t>
+                    <w:t>      </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>

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

@@ -34,7 +34,7 @@ public enum ProcDefEnum {
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
     //    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),
-    BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:2:5357504"),
+    BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:3:11372504"),
     QKBUSDELIVEREDAPPLY("欠款出库申请", "process_161otrwo:3:7192504"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java

@@ -82,4 +82,9 @@ public interface LoanHomevisitFileexamineFeign {
     @PostMapping("/pushMessageToSale")
     @ResponseBody
     ResultBean pushMessageToSale(@RequestBody SaleOrderPushMessage saleOrderPushMessage);
+
+    @ApiOperation("根据销售订单sid查询家访资料审核结果")
+    @PostMapping("/selSaleOrderSid")
+    @ResponseBody
+    ResultBean<String> selSaleOrderSid(@RequestParam("salesOrderSid") String salesOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java

@@ -76,4 +76,9 @@ public class LoanHomevisitFileexamineFeignFallback implements LoanHomevisitFilee
 	public ResultBean pushMessageToSale(SaleOrderPushMessage saleOrderPushMessage) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selSaleOrderSid(String salesOrderSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -227,4 +227,9 @@ public interface LoanHomevisitInvestigateFeign {
     @PostMapping("/selSaleOrderSidAndBorrSid")
     @ResponseBody
     ResultBean<String> selSaleOrderSidAndBorrSid(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid);
+
+    @ApiOperation("根据销售订单sid查询家访考察结果")
+    @PostMapping("/selSaleOrderSid")
+    @ResponseBody
+    ResultBean<String> selSaleOrderSid(@RequestParam("salesOrderSid") String salesOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -220,4 +220,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selSaleOrderSid(String salesOrderSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java

@@ -63,4 +63,7 @@ public interface LoanHomevisitFileexamineMapper extends BaseMapper<LoanHomevisit
 	List<LoanHomevisitFileexamineVo> selectListVo();
 
     String selectByOrderSid(String saleOrderSid);
+
+	@Select("select state from loan_homevisit_fileexamine where saleOrderSid = #{salesOrderSid}")
+	String selSaleOrderSid(String salesOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java

@@ -97,4 +97,9 @@ public class LoanHomevisitFileexamineRest implements LoanHomevisitFileexamineFei
 	public ResultBean pushMessageToSale(SaleOrderPushMessage saleOrderPushMessage) {
 		return loanHomevisitFileexamineService.pushMessageToSale(saleOrderPushMessage);
 	}
+
+	@Override
+	public ResultBean<String> selSaleOrderSid(String salesOrderSid) {
+		return loanHomevisitFileexamineService.selSaleOrderSid(salesOrderSid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -698,4 +698,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
     public String selectByOrderSid(String saleOrderSid) {
         return baseMapper.selectByOrderSid(saleOrderSid);
     }
+
+    public ResultBean<String> selSaleOrderSid(String salesOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String state = baseMapper.selSaleOrderSid(salesOrderSid);
+        return rb.success().setData(state);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java

@@ -98,4 +98,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
 
     @Select("select sid from loan_homevisit_investigate where saleOrderSid = #{orderSid} and saleOrderBorrowerSid = #{borrowerSid}")
     String selSaleOrderSidAndBorrSid(@Param("orderSid") String orderSid,@Param("borrowerSid") String borrowerSid);
+
+    @Select("select investigateValue from loan_homevisit_investigate where saleOrderSid = #{salesOrderSid}")
+    String selSaleOrderSid(String salesOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java

@@ -245,4 +245,9 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
     public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
         return loanHomevisitInvestigateService.selSaleOrderSidAndBorrSid(orderSid,borrowerSid);
     }
+
+    @Override
+    public ResultBean<String> selSaleOrderSid(String salesOrderSid) {
+        return loanHomevisitInvestigateService.selSaleOrderSid(salesOrderSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -2164,4 +2164,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         String sid = baseMapper.selSaleOrderSidAndBorrSid(orderSid,borrowerSid);
         return rb.success().setData(sid);
     }
+
+    public ResultBean<String> selSaleOrderSid(String salesOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String investigateValue = baseMapper.selSaleOrderSid(salesOrderSid);
+        return rb.success().setData(investigateValue);
+    }
 }