|
@@ -1026,7 +1026,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
}
|
|
|
|
|
|
if(!map.containsKey("oYeFlag")) {
|
|
|
- pushCarNumberToEas(map);
|
|
|
+
|
|
|
+ if(placeAddress == null || !placeAddress.contains("欧冶")){
|
|
|
+ pushCarNumberToEas(map);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
@@ -2254,6 +2257,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
if (mapValue.get("orderId") == null) {
|
|
|
throw new Exception("还未派车,不允许修改车牌号");
|
|
|
}
|
|
|
+
|
|
|
+ String addressPlace = omstruckOrderMapper.getAddressPlace(DataChange.dataToBigDecimal(mapValue.get("orderId")));
|
|
|
|
|
|
if(mapValue.get("saleOrderMaterialId") != null && DataChange.dataToBigDecimal(mapValue.get("capacityId")).compareTo(new BigDecimal(35128)) != 0) {
|
|
|
Integer flCount = amsSaleMaterialMapper.getAbleFlcount(DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId")));
|
|
@@ -2268,7 +2273,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
mapValue.put("oldCapacityNumber",oldCapacityNumber);
|
|
|
if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0) {
|
|
|
mapValue.put("result",1);
|
|
|
- pushCarNumberToEas(mapValue);
|
|
|
+
|
|
|
+ if(addressPlace == null || !addressPlace.contains("欧冶") || "5".equals(carStatus.toString())) {
|
|
|
+ pushCarNumberToEas(mapValue);
|
|
|
+ }
|
|
|
return mapValue;
|
|
|
}
|
|
|
|
|
@@ -2320,7 +2328,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
}
|
|
|
}
|
|
|
if(!mapValue.containsKey("oYeFlag")) {
|
|
|
- pushCarNumberToEas(mapValue);
|
|
|
+
|
|
|
+ if(addressPlace == null || !addressPlace.contains("欧冶")) {
|
|
|
+ pushCarNumberToEas(mapValue);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|