Merge remote-tracking branch 'origin/master'

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

@@ -207,4 +207,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     BigDecimal getPriceIdByPlaceId(BigDecimal placeId);
 
+    //查询车牌号是否是黑名单
+    int isBlackList(String capacityNumber);
+
 }

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

@@ -888,6 +888,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             //    }
             //    throw new Exception(capacityNumber+"有未完成的运输订单任务，无法派单");
             //}
+            //查询车牌号是否是黑名单
+            if(amsSaleOrderMapper.isBlackList(capacityNumber)>0){
+                throw new Exception("该车在黑名单中，无法派车！请联系销售公司！");
+            }
             //非自提订单 && 本次校验GPS && 全局GPS校验打开
             if((selfMention==null || selfMention.equals("否")) && onceCheck && (isCheckGps!=null && isCheckGps==0)){
                 Map<String,Object> locationResult = null;
@@ -2004,6 +2008,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         }catch (Exception e){
             //取值失败不处理，取默认值
         }
+        //查询车牌号是否是黑名单
+        if(amsSaleOrderMapper.isBlackList(capacityNo)>0){
+            throw new Exception("该车在黑名单中，无法派车！请联系销售公司！");
+        }
         //非自提，单次校验且全局校验
         if((selfMention==null || selfMention.equals("否")) && onceCheck && (isCheckGps!=null && isCheckGps==0)){
             Map<String,Object> data = (Map<String,Object>)otmsFeign.getCurrentLocation(capacityNo).getData();

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

@@ -4714,5 +4714,10 @@
     AND ACTP.PLACE_ID = #{placeId}
     fetch first 1 row only
   </select>
+  <select id="isBlackList" resultType="java.lang.Integer">
+    SELECT count(CAPACITY_ID)
+    FROM RMS_CAPACITY
+    WHERE CAPACITY_NUMBER=#{capacityNumber} AND CAPACITY_BLACKLIST='是'
+  </select>
 
 </mapper>