Merge remote-tracking branch 'origin/master'

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

@@ -1209,7 +1209,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             String linkSid = b.getLinkSid();
                             int count = b.getUsingNum();
                             //查询该采购订单的已使用台数
-                            int num = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+                            int num = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
 //                            int numcount = num-count;
                             //更新
                             ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(num));
@@ -1311,7 +1311,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         String linkSid = b.getLinkSid();
                         int count = b.getUsingNum();
                         //查询该采购订单的已使用台数
-                        int num = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+                        int num = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
 //                        int numcount = num-count;
                         //更新
                         ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(num));
@@ -1366,7 +1366,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             String linkSid = b.getLinkSid();
                             int count = b.getUsingNum();
                             //查询该采购订单的已使用台数
-                            int num = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+                            int num = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
 //                            int numcount = num-count;
                             //更新
                             ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(num));
@@ -3127,7 +3127,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) {
                 String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
                 //查询该采购订单的已使用台数
-                int count = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+                int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
                 count = count + busSalesVehicleOrderDetailsVo.getUsingNum();
                 //更新该采购订单的锁定台数
                 ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java

@@ -81,6 +81,7 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
     List<String> selectListBySid(String sid);
 
     int selectByLinkSid(String linkSid);
+    int selectByLinkSid1(String linkSid);
 
     List<BusSalesVehicleOrder> selectLinkSid(String businessSid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -58,6 +58,15 @@
           and bo.nodeState != '销售订单申请'
     </select>
 
+    <select id="selectByLinkSid1" resultType="int">
+        select ifnull(sum(IFNULL(cast(bs.usingNum as signed), '0')), 0)
+        from bus_sales_vehicle_order bs
+        left join bus_sales_order bo on bo.sid = bs.salesOrderSid
+        where bs.linkSid = #{linkSid}
+        and length(bo.nodeState) > 0
+        and (bo.nodeState != '销售订单申请' and bo.nodeState != '终止')
+    </select>
+
     <select id="selectLinkSid" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder">
         select *
         from bus_sales_vehicle_order

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -164,6 +164,10 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
         return baseMapper.selectByLinkSid(linkSid);
     }
 
+    public int selectByLinkSid1(String linkSid) {
+        return baseMapper.selectByLinkSid1(linkSid);
+    }
+
     public List<BusSalesVehicleOrder> selectLinkSid(String businessSid) {
         return baseMapper.selectLinkSid(businessSid);
     }