解决冲突

src/main/java/com/steerinfo/dil/mapper/DilCidCapacityMapper.java

@@ -11,4 +11,6 @@ public interface DilCidCapacityMapper extends IBaseMapper<DilCidCapacity, BigDec
 
     @Select("select seq_dil_cid_capacityNo.nextval from dual")
     BigDecimal getCidMax();
+
+    Integer selectByCidAndCapacityNo(String cid, String capacityNo);
 }

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -1,5 +1,8 @@
 package com.steerinfo.dil.service;
 
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+
 import java.util.List;
 import java.util.Map;
 
@@ -21,4 +24,5 @@ public interface UniversalService {
     List<String> getWarranty(java.lang.String orderNumber);
 
     List<String> getTest(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/service/impl/BackgroundProcessingServiceImpl.java

@@ -118,6 +118,11 @@ public class BackgroundProcessingServiceImpl implements IBackgroundProcessServic
     @Override
     public int bindCidCapacityNo(String cid, String capacityNo) {
         DilCidCapacity dilCidCapacity = new DilCidCapacity();
+        //根据车牌号和cid去查询是否存在
+        Integer j = dilCidCapacityMapper.selectByCidAndCapacityNo(cid,capacityNo);
+        if(j > 0){
+            return 0;
+        }
         dilCidCapacity.setCidCapacityId(dilCidCapacityMapper.getCidMax());
         dilCidCapacity.setCid(cid);
         dilCidCapacity.setCapacityNumber(capacityNo);

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -239,7 +239,6 @@ public class UniversalServiceImpl implements UniversalService {
      * 关闭过期运输订单
      * @return
      */
-    @Async
     @Scheduled(cron = "0 0 8 * * ?")
     public void closePassedOrder() {
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();

src/main/resources/com/steerinfo/dil/mapper/DilCidCapacityMapper.xml

@@ -223,6 +223,7 @@
     <include refid="select"/>
     <include refid="whereLike"/>
   </select>
+
   <insert id="batchInsert" parameterType="java.util.List">
     insert into DIL_CID_CAPACITY 
       (CID_CAPACITY_ID, 
@@ -288,5 +289,9 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <select id="selectByCidAndCapacityNo" resultType="java.lang.Integer" parameterType="string">
+    select count(DCC.CAPACITY_NUMBER) from DIL_CID_CAPACITY DCC
+    WHERE DCC.CAPACITY_NUMBER = #{capacityNo}
+    AND DCC.CID = #{cid}
+  </select>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -773,7 +773,7 @@
 
 
     <select id="getWarranty" resultType="java.util.Map" parameterType="java.lang.String">
-        select oom.WARRANTY_CODE "warrantyCode"
+        select oo "warrantyCode"
         from OMSTRUCK_ORDER oo
         left join OMSTRUCK_ORDER_MATERIAL oom
         on oom.ORDER_ID = oo.ORDER_ID
@@ -1074,10 +1074,17 @@
     </update>
 
     <select id="getSteelOrderNum" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM OMSTRUCK_ORDER OO
-        WHERE OO.ORDER_LINE_SEQUENCE &gt;= 1
-        AND   OO.ORDER_STATUS = 5
-        AND   OO.ORDER_TYPE = 1
+        SELECT
+            COUNT( * )
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE
+            OO.ORDER_LINE_SEQUENCE >= 1
+          AND OO.ORDER_STATUS = 5
+          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+          AND OO.ORDER_TYPE = 1
     </select>
     <select id="getInwardWeightMaterial" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM (SELECT