优化

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

@@ -116,7 +116,9 @@
         left join bus_sales_order bo on bv.salesOrderSid = bo.sid
         left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
         where bo.contractNo = #{contractId}
-        and (bs.busState != '401' or bs.busState != '403') and (bs.finState != '1' or bs.carryVehicleState != '1')
+        and (bs.busState = '401'
+        or bs.busState = '403') and (bs.finState != '1'
+        and bs.carryVehicleState != '1')
         and bv.linkSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}

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

@@ -2431,6 +2431,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 }
             }
             List<String> vinNoListss = baseMapper.selectVinNosss(dto.getContractId(), vinSid);
+            vinNoListss.removeAll(Collections.singleton(null));
             if (!vinNoListss.isEmpty()) {
                 return rb.setMsg(String.join(",", vinNoListss) + "不符合出库的条件");
             }