|
@@ -2075,11 +2075,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
//非自提,单次校验且全局校验
|
|
|
if((selfMention==null || selfMention.equals("否")) && onceCheck && (isCheckGps!=null && isCheckGps==0)){
|
|
|
Map<String,Object> data = (Map<String,Object>)otmsFeign.getCurrentLocation(capacityNo).getData();
|
|
|
- Map<String,Object> locationResult = (Map<String,Object>)data.get("result");
|
|
|
int isGPS=amsSaleOrderMapper.isGPS(capacityNo);
|
|
|
if(isGPS > 0){
|
|
|
System.out.println(capacityNo+"允许无GPS派车");
|
|
|
- }else if(locationResult==null || locationResult.get("lon")==null || locationResult.get("lat")==null){
|
|
|
+ }else if(data==null || !"1001".equals(""+data.get("status"))){
|
|
|
throw new Exception("该车没有GPS定位信息,请联系销售公司物流部,申请是否可以派车。");
|
|
|
}
|
|
|
}
|