优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java

@@ -33,4 +33,8 @@ public interface BaseVehicleStateFeign {
     @PostMapping("selectOneQKKPByBusSid")
     @ResponseBody
     ResultBean<BaseVehicleState> selectOneQKKPByBusSid(@RequestParam("busSid") String sid);
+
+    @PostMapping("selectByVinSid")
+    @ResponseBody
+    ResultBean<BaseVehicleState> selectByVinSid(@RequestParam("vehSid") String vehSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java

@@ -21,4 +21,6 @@ public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
     BaseVehicleState selectOneByBusSid(String busSid);
 
     BaseVehicleState selectOneQKKPByBusSid(String sid);
+
+    BaseVehicleState selectByVinSid(String vehSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml

@@ -32,4 +32,12 @@
           AND carryInvoiceState = '0'
           AND busState = '401'
     </select>
+
+    <select id="selectByVinSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
+        SELECT *
+        FROM base_vehicle_state
+        WHERE vinSid = #{vehSid}
+          AND carryVehicleState = '0'
+          AND carryInvoiceState = '0'
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java

@@ -40,5 +40,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign {
         return baseVehicleStateService.selectOneQKKPByBusSid(sid);
     }
 
+    @Override
+    public ResultBean<BaseVehicleState> selectByVinSid(String vehSid) {
+        return baseVehicleStateService.selectByVinSid(vehSid);
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -180,4 +180,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
         BaseVehicleState baseVehicleState = baseMapper.selectOneQKKPByBusSid(sid);
         return rb.success().setData(baseVehicleState);
     }
+
+    public ResultBean<BaseVehicleState> selectByVinSid(String vehSid) {
+        ResultBean<BaseVehicleState> rb = ResultBean.fireFail();
+        BaseVehicleState baseVehicleState = baseMapper.selectByVinSid(vehSid);
+        return rb.success().setData(baseVehicleState);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -7086,16 +7086,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<List<String>> rb = ResultBean.fireFail();
         List<String> stringList = baseMapper.selectQKBusinessSid(userSid, useOrgSid);
         stringList.removeAll(Collections.singleton(null));
-        List<String> busSids = new ArrayList<>();
-        for (String orderSid : stringList) {
-            SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(orderSid).getData();
-            if (solutionsDetailsVo != null) {
-                if ("02".equals(solutionsDetailsVo.getTypeKey())) {
-                    busSids.add(orderSid);
-                }
-            }
-        }
-        return rb.success().setData(busSids);
+        return rb.success().setData(stringList);
     }
 
     public List<String> selectByContractNoToVin(String contractId) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -41,6 +41,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
@@ -2015,6 +2016,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public ResultBean submitFinBillApplicationQK(SubmitFinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
+        for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
+            BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByVinSid(finBillVehicle.getVehSid()).getData();
+            if (baseVehicleState == null){
+                return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票，请重新选择");
+            }
+        }
         String contractNo = dto.getContractNo();
         List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
         if (finBillApplicationDetailsVos != null) {