修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-ams-api</artifactId>
-    <version>1.5</version>
+    <version>1.6</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -1000,7 +1000,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
             //判断是欧冶
             String placeAddress = amsSaleOrderMapper.getPlaceAddress(saleOrderMaterialId);
-            if (placeAddress != null && placeAddress.contains("欧冶")) {
+            //非自提，单次校验且全局校验，且车不允许无GPS
+            int isGPS = amsSaleOrderMapper.isGPS(capacityNumber);
+            if (placeAddress != null && placeAddress.contains("欧冶") && onceCheck && onceCheck && (isCheckGps!=null && isCheckGps==0) && isGPS <= 0) {
                 Map<String,Object> data=null;
                 try{
                     data= (Map<String,Object>)otmsFeign.getCurrentLocation(capacityNumber).getData();
@@ -1011,8 +1013,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     throw new Exception("该车没有GPS定位信息，请联系销售公司物流部，申请是否可以派车。");
                 }
             }
-            //非自提，单次校验且全局校验，且车不允许无GPS
-            int isGPS = amsSaleOrderMapper.isGPS(capacityNumber);
             if((selfMention==null || selfMention.equals("否")) && onceCheck && (isCheckGps!=null && isCheckGps==0) && isGPS <= 0){
                 Map<String,Object> data=null;
                 try{
@@ -2293,8 +2293,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         if(amsSaleOrderMapper.isBlackList(capacityNo)>0){
             throw new Exception("该车在黑名单中，无法派车！请联系销售公司！");
         }
+        //非自提，单次校验且全局校验，且车辆不允许无GPS
+        int isGPS=amsSaleOrderMapper.isGPS(capacityNo);
         String placeAddress = amsSaleOrderMapper.getPlaceAddress(DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId")));
-        if (placeAddress != null && placeAddress.contains("欧冶")) {
+        if (placeAddress != null && placeAddress.contains("欧冶") && onceCheck && (isCheckGps!=null && isCheckGps==0) && isGPS <= 0) {
             Map<String,Object> data=null;
             try{
                 data= (Map<String,Object>)otmsFeign.getCurrentLocation(capacityNo).getData();
@@ -2305,8 +2307,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 throw new Exception("该车没有GPS定位信息，请联系销售公司物流部，申请是否可以派车。");
             }
         }
-        //非自提，单次校验且全局校验，且车辆不允许无GPS
-        int isGPS=amsSaleOrderMapper.isGPS(capacityNo);
+
         if((selfMention==null || selfMention.equals("否")) && onceCheck && (isCheckGps!=null && isCheckGps==0) && isGPS <= 0){
             Map<String,Object> data=null;
             try{