Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -1348,7 +1348,11 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
             result = amsSaleOrderService.updateCapacityNumberInFactory(mapValue);
         }catch (Exception e){
             e.printStackTrace();
-            return failed(e.getMessage());
+            if(e.getMessage()==null || e.getMessage().contains("Exception")){
+                return failed("未知异常，请重试！");
+            }else{
+                return failed(e.getMessage());
+            }
         }
         int result1= (int) result.get("result");
         if (result1 == 0) {

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

@@ -921,20 +921,16 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             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;
-                int isGPS=0;
+            //非自提，单次校验且全局校验，且车不允许无GPS
+            int isGPS=amsSaleOrderMapper.isGPS(capacityNumber);
+            if((selfMention==null || selfMention.equals("否")) && onceCheck && (isCheckGps!=null && isCheckGps==0) && isGPS <= 0){
+                Map<String,Object> data=null;
                 try{
-                    Map<String,Object> data = (Map<String,Object>)otmsFeign.getCurrentLocation(capacityNumber).getData();
-                    locationResult = (Map<String,Object>)data.get("result");
-                    isGPS=amsSaleOrderMapper.isGPS(capacityNumber);
+                    data= (Map<String,Object>)otmsFeign.getCurrentLocation(capacityNumber).getData();
                 }catch (Exception e){
-                  //出现任何异常不抛出，不终止程序
+                    throw new Exception("该车没有GPS定位信息，请联系销售公司物流部，申请是否可以派车。");
                 }
-                if(isGPS > 0){
-                    System.out.println(capacityNumber+"允许无GPS派车");
-                }else if(locationResult==null || locationResult.get("lon")==null || locationResult.get("lat")==null){
+                if(data==null || !"1001".equals(""+data.get("status"))){
                     throw new Exception("该车没有GPS定位信息，请联系销售公司物流部，申请是否可以派车。");
                 }
             }
@@ -1035,8 +1031,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 运单状态
                 omstruckOrder.setOrderStatus(new BigDecimal(4));
                 // 司机电话
-                if (driverTel != null && !"null".equals(driverTel)) {
+                if (driverTel != null && !"".equals(driverTel)){
                     omstruckOrder.setDriverTel(driverTel);
+                }else if(tel != null && !"".equals(tel)){
+                    omstruckOrder.setDriverTel(tel);
                 }
                 BigDecimal status;
                 // 钢材
@@ -2073,14 +2071,16 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         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();
-            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){
+        //非自提，单次校验且全局校验，且车辆不允许无GPS
+        int isGPS=amsSaleOrderMapper.isGPS(capacityNo);
+        if((selfMention==null || selfMention.equals("否")) && onceCheck && (isCheckGps!=null && isCheckGps==0) && isGPS <= 0){
+            Map<String,Object> data=null;
+            try{
+                data= (Map<String,Object>)otmsFeign.getCurrentLocation(capacityNo).getData();
+            }catch (Exception e){
+                throw new Exception("该车没有GPS定位信息，请联系销售公司物流部，申请是否可以派车。");
+            }
+            if(data==null || !"1001".equals(""+data.get("status"))){
                 throw new Exception("该车没有GPS定位信息，请联系销售公司物流部，申请是否可以派车。");
             }
         }

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

@@ -508,7 +508,8 @@
     apo.PUCHASE_ORDER_DELIVERY_DATE as "purchaseOrderDeliveryDate",
     apo.INSERT_UPDATE_REMARK as "insertUpdateRemark",
     apo.PURCHASE_ORDER_ID as "purchaseOrderId",
-    apo.PURCHASING_ORGANIZATION_ID  "orgId"
+    apo.PURCHASING_ORGANIZATION_ID  "orgId",
+    decode(apo.DELETED,1,'已删除','未删除') "deleted"
     FROM AMS_PURCHASE_ORDER apo
     LEFT JOIN DIL_BATCH db
     ON apo.BATCH_ID = db.BATCH_ID