移动端出库开票调整

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

@@ -30,5 +30,7 @@ public class AppVinListVo implements Vo {
 
     private String loanName;
 
-
+    private String appendText;
+    private Boolean appendSameSelected;
+    private String appendSelectedNotice;
 }

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

@@ -547,12 +547,16 @@
     </select>
 
     <select id="vinLists3" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
-        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName
+        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName,
+        IF(bo.payTypeKey = '2',true,false) AS appendSameSelected,
+        IF(bo.payTypeKey = '1','',IF(fi.VIN IS NULL,'未开票','开票')) AS appendText,
+        IF(bo.payTypeKey = '2','贷款业务，不能同时选择已开票和未开票的车辆！','') AS appendSelectedNotice
         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 length(bv.linkSid)>0 and bo.contractNo = #{contractNo}  and bbv.vehicleState != '0002' and bo.payTypeKey = '1'
         AND bv.sid IN (
         SELECT
@@ -563,12 +567,16 @@
         busState = '401'
         AND ( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = 1 )))
         union all
-        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName
+        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName,
+        IF(bo.payTypeKey = '2',TRUE,FALSE) AS appendSameSelected,
+        IF(bo.payTypeKey = '1','',IF(fi.VIN IS NULL,'未开票','开票')) AS appendText,
+        IF(bo.payTypeKey = '2','贷款业务，不能同时选择已开票和未开票的车辆！','') AS appendSelectedNotice
         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 length(bv.linkSid)>0 and bo.contractNo = #{contractNo}  and bbv.vehicleState != '0002' and bo.payTypeKey = '2'
         <if test = "loanSid != '' and loanSid != null">
             and bv.borrowerSid = #{loanSid}

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

@@ -428,8 +428,16 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             if ("2".equals(appDeliveredDetailsVo.getPaymentMethodKey())) {
                 appDeliveredDetailsVo.setShowLoanUser(true);
                 appDeliveredDetailsVo.setForbidInvoiceChoice(true);
-                appDeliveredDetailsVo.setHasInvoice("否");
-                appDeliveredDetailsVo.setHasInvoiceKey("0");
+                String vinSid = list.get(0);
+                //判断车辆是否开过票
+                FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(vinSid, contractNo).getData();
+                if (finVehicleInvoice == null){
+                    appDeliveredDetailsVo.setHasInvoice("是");
+                    appDeliveredDetailsVo.setHasInvoiceKey("1");
+                }else {
+                    appDeliveredDetailsVo.setHasInvoice("否");
+                    appDeliveredDetailsVo.setHasInvoiceKey("0");
+                }
             }
             //客户名称
             appDeliveredDetailsVo.setName(appOrderDetailsVo.getName());
@@ -463,7 +471,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 String vinSid = list.get(i);
                 //判断车辆是否开过票
                 FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(vinSid, contractNo).getData();
-                if (StringUtils.isBlank(finVehicleInvoice.getVIN())){
+                if (finVehicleInvoice == null){
                     appDeliveredDetailsVo.setIsKp(0);
                 }else {
                     appDeliveredDetailsVo.setIsKp(1);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java

@@ -26,4 +26,8 @@ public class VinListVo implements Vo {
     private String zlStateValue;
     @ApiModelProperty("资料是否齐全：0未齐全/1已齐全")
     private String zlState;
+
+    private String appendText;
+    private Boolean appendSameSelected;
+    private String appendSelectedNotice;
 }