优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/AppCarListVo.java

@@ -32,5 +32,8 @@ public class AppCarListVo implements Vo {
     @ApiModelProperty("资料是否齐全：0未齐全/1已齐全")
     private String zlState;
 
+    private String qkKpSid;
+    private String qkLpSid;
+
 
 }

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

@@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication;
 import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo;
 import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationVo;
 import com.yxt.anrui.buscenter.api.busbillapplication.*;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -77,4 +78,6 @@ public interface BusBillApplicationMapper extends BaseMapper<BusBillApplication>
     BusBillApplication selectByCkSidAll(String sid);
 
     BusBillApplication selectByContractNoAndSid(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
+
+    FinBillApplication selectByNo(String billNo);
 }

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

@@ -98,4 +98,8 @@
         left join anrui_fin.fin_bill_vehicle bvv on ba.sid = bvv.billAppSid
         where ba.contractNo = #{contractNo} and bvv.vehSid = #{vinSid} and ba.billStateKey = '003' and ba.nodeState = '已办结' order by id desc limit 1
     </select>
+
+    <select id="selectByNo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplication">
+        select bi.* from anrui_fin.fin_bill_application bi where bi.qkkpBillNo = #{billNo} order by id desc limit 1
+    </select>
 </mapper>

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

@@ -60,6 +60,7 @@ 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.finbillapplication.FinBillApplication;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -468,4 +469,8 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
     public BusBillApplication selectByContractNoAndSid(String contractNo, String vinSid) {
         return baseMapper.selectByContractNoAndSid(contractNo,vinSid);
     }
+
+    public FinBillApplication selectByNo(String billNo) {
+        return baseMapper.selectByNo(billNo);
+    }
 }

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

@@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication;
 import com.yxt.anrui.buscenter.api.busdelivered.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.DeliveredDetailsVo2;
@@ -50,6 +51,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.biz.busbillapplication.BusBillApplicationService;
 import com.yxt.anrui.buscenter.biz.busdeliveredapply.BusDeliveredApplyService;
 import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
 import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
@@ -57,6 +59,7 @@ import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessage
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 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.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -130,6 +133,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
     private LoanFileexamineFeign loanFileexamineFeign;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BusBillApplicationService busBillApplicationService;
 
     /**
      * 待出库车辆分页列表
@@ -992,9 +997,20 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             //根据合同编号和车辆sid查询
             for (int i = 0; i < list.size(); i++) {
                 String vinSid = list.get(i);
+
                 //根据合同编号和车辆sid查询销售订单的车辆信息
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid);
                 AppCarListVo appCarListVo = new AppCarListVo();
+                //根据合同和车辆sid获取欠款开票的信息
+                BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(query.getContractId(), vinSid);
+                if(busBillApplication != null){
+                    appCarListVo.setQkKpSid(busBillApplication.getSid());
+                    //根据欠款开票的编号查询
+                    FinBillApplication finBillApplication = busBillApplicationService.selectByNo(busBillApplication.getBillNo());
+                    if(finBillApplication != null){
+                        appCarListVo.setQkLpSid(finBillApplication.getSid());
+                    }
+                }
                 appCarListVo.setVinSid(list.get(i));
                 //查询该车辆是否有挂车
                 ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, contractNo);
@@ -1307,6 +1323,16 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo();
             deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
             appCarListVo.setRealBuyer(deliveredUseMessagesVo);
+            //根据合同和车辆sid获取欠款开票的信息
+            BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(query.getContractNo(), vinSid);
+            if(busBillApplication != null){
+                appCarListVo.setQkKpSid(busBillApplication.getSid());
+                //根据欠款开票的编号查询
+                FinBillApplication finBillApplication = busBillApplicationService.selectByNo(busBillApplication.getBillNo());
+                if(finBillApplication != null){
+                    appCarListVo.setQkLpSid(finBillApplication.getSid());
+                }
+            }
             list.add(appCarListVo);
         }
         return rb.success().setData(list);

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

@@ -21,4 +21,7 @@ public class CarListVo2 implements Vo {
 
     @ApiModelProperty("实际购车人")
     private DeliveredUseMessagesVo realBuyer;
+
+    private String qkKpSid;
+    private String qkLpSid;
 }

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

@@ -118,4 +118,6 @@ public class DeliveredDetailsVoQk2 implements Vo {
     @ApiModelProperty("车辆登记合同")
     private List<String> carFileList = new ArrayList<>();
 
+
+
 }