优化出库申请提交

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

@@ -99,10 +99,11 @@
 
     <select id="selectVinNo" resultType="java.lang.String">
         select RIGHT(bv.linkNo, 8)
-        from bus_delivered bd
-                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
-        where bd.contractNo = #{contractId}
-          and bd.state = 0
+        from bus_sales_order_vehicle bv
+                 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>=402)
           and bv.linkSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
@@ -137,7 +138,7 @@
     </select>
 
     <select id="selectNumByContractNo" resultType="int">
-        select IFNULL(sum(bddd.giveNum),0) from bus_delivered_details_discount bddd left join bus_delivered bd on bd.sid = bddd.applySid
+        select IFNULL(sum(bddd.giveNum),0) from bus_delivered_details_discount bddd left join bus_delivered_apply bd on bd.sid = bddd.applySid
         where contractNo = #{contractId} and (bd.state =2 or bd.state = 3)
     </select>
 </mapper>