贷款业务可以出库开票的车辆必须满足首付款及费用交清（含订金）且担保的家访资料审核通过或非担保家访考察通过

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

@@ -308,7 +308,7 @@
             WHERE
             busState = '401'
            <!-- AND  (finState = '1' OR carryVehicleState = '1' )) AND bbv.vehicleState != '0002'-->
-            AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1')))  AND bbv.vehicleState != '0002'
+            AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and finState = '1' and manageState = '1')))  AND bbv.vehicleState != '0002'
         </where>
         order by bo.contractNo desc,bv.id desc) a
 
@@ -447,7 +447,7 @@
             anrui_base.base_vehicle_state
             WHERE
             busState = '401'
-            AND (saleTypeKey = '2' and invoiceApplyState = '1'))
+            AND (saleTypeKey = '2' and finState = '1' and manageState = '1'))
             AND bbv.vehicleState != '0002'
         </where>
         GROUP BY

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

@@ -416,27 +416,6 @@ 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");