修改

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

@@ -79,4 +79,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     int selectSaleMaterialNum(BigDecimal orderId);
 
+    BigDecimal getOrderType(BigDecimal orderId);
+
 }

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

@@ -2093,6 +2093,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public Map<String, Object> updateCapacityNumberInFactory(Map<String, Object> mapValue) throws Exception {
         Object lineSequence = mapValue.get("lineSequence");
         Object carStatus = mapValue.get("carStatus");
+        if(carStatus == null) {
+            carStatus = omstruckOrderMapper.getOrderStatus(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+        }
+        BigDecimal orderTypee = omstruckOrderMapper.getOrderType(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+        if(orderTypee.compareTo(new BigDecimal(4)) == 0) {
+            mapValue.put("driverTel",mapValue.get("mapValue") + "");
+            mapValue.put("isCheckGPS",false);
+        }
         int result = 0;
         if (mapValue.get("orderId") == null) {
             throw new Exception("还未派车,不允许修改车牌号");
@@ -2107,7 +2115,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         //查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
         BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
         String oldCapacityNumber = omstruckOrderMapper.getOldCapacityNumber(oldCapacityId);
-        if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0) {
+        if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0 && orderTypee.compareTo(new BigDecimal(1)) == 0) {
             mapValue.put("result",1);
             pushCarNumberToEas(mapValue);
             return mapValue;
@@ -2147,7 +2155,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 throw new Exception("该车没有GPS定位信息，请联系销售公司物流部，申请是否可以派车。");
             }
         }
-        pushCarNumberToEas(mapValue);
+        if(orderTypee.compareTo(new BigDecimal(1)) == 0) {
+            pushCarNumberToEas(mapValue);
+        }
+
         //try{
         //    //不为空且为新手机号，则修改电话号码
         //    if(driverTel!=null && !"".equals(driverTel) && !driverTel.equals(tel)){

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

@@ -981,4 +981,8 @@
         TWR.SALE_MATERIAL_ID is not null
         AND TTR.ORDER_ID = #{orderId}
     </select>
+    <select id="getOrderType" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+        SELECT OO.ORDER_TYPE FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>