|
@@ -928,8 +928,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
|
|
|
String tel=omstruckOrderMapper.getTelByCapacityId(capacityId);
|
|
|
String driverTel = (String) map.get("driverTel");
|
|
|
- if((tel==null || "".equals(tel)) && (driverTel==null || "".equals(driverTel))){
|
|
|
- throw new Exception("该车没有电话号码,无法派车!请填写电话号码!");
|
|
|
+ if(tel==null || "".equals(tel)){
|
|
|
+ throw new Exception("该车没有电话号码,无法派车!请去资源管理-运力维护该车的电话号码!");
|
|
|
}
|
|
|
|
|
|
if(amsSaleOrderMapper.isBlackList(capacityNumber)>0){
|
|
@@ -965,18 +965,18 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
|
|
|
BigDecimal lineId = DataChange.dataToBigDecimal(map.get("lineId"));
|
|
|
BigDecimal isSteel = new BigDecimal(1);
|
|
|
- try{
|
|
|
-
|
|
|
- if(driverTel!=null && !"".equals(driverTel) && !driverTel.equals(tel)){
|
|
|
- Map<String,Object> map1=new HashMap<>();
|
|
|
- map1.put("capacityNumber",capacityNumber);
|
|
|
- map1.put("capacityTel",driverTel);
|
|
|
-
|
|
|
- rmsFeign.updateCapacity(map1);
|
|
|
- }
|
|
|
- }catch (Exception e){
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if (capacityId == null) {
|
|
|
return 0;
|
|
|
}
|
|
@@ -1045,9 +1045,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(4));
|
|
|
|
|
|
- if (driverTel != null && !"".equals(driverTel)){
|
|
|
- omstruckOrder.setDriverTel(driverTel);
|
|
|
- }else if(tel != null && !"".equals(tel)){
|
|
|
+ if(tel != null && !"".equals(tel)){
|
|
|
omstruckOrder.setDriverTel(tel);
|
|
|
}
|
|
|
BigDecimal status;
|
|
@@ -2067,8 +2065,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
|
|
|
String tel=omstruckOrderMapper.getTelByCapacityId(DataChange.dataToBigDecimal(mapValue.get("capacityId")));
|
|
|
String driverTel = (String) mapValue.get("driverTel");
|
|
|
- if((tel==null || "".equals(tel)) && (driverTel==null || "".equals(driverTel))){
|
|
|
- throw new Exception("该车没有电话号码,无法派车!请填写电话号码!");
|
|
|
+ if(tel==null || "".equals(tel)){
|
|
|
+ throw new Exception("该车没有电话号码,无法派车!请去资源管理-运力维护该车的电话号码!");
|
|
|
}
|
|
|
Integer isCheckGps = amsSaleOrderMapper.getDispachSwitch();
|
|
|
String capacityNo = (String) mapValue.get("capacityNo");
|
|
@@ -2100,21 +2098,21 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
}
|
|
|
}
|
|
|
pushCarNumberToEas(mapValue);
|
|
|
- try{
|
|
|
-
|
|
|
- if(driverTel!=null && !"".equals(driverTel) && !driverTel.equals(tel)){
|
|
|
- Map<String,Object> map1=new HashMap<>();
|
|
|
- map1.put("capacityNumber",capacityNo);
|
|
|
- map1.put("capacityTel",driverTel);
|
|
|
-
|
|
|
- rmsFeign.updateCapacity(map1);
|
|
|
- mapValue.put("capacityTel",driverTel);
|
|
|
- }else{
|
|
|
- mapValue.put("capacityTel",tel);
|
|
|
- }
|
|
|
- }catch (Exception e){
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
saleLogUtil.logOrder(DataChange.dataToBigDecimal(mapValue.get("orderId")),"修改车牌号",mapValue,SaleLogUtil.UPDATE);
|
|
|
if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
|
|
|
String capacityids="";
|
|
@@ -2143,12 +2141,18 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(4));
|
|
|
omstruckOrder.setOrderLineSequence(new BigDecimal(0));
|
|
|
omstruckOrder.setInsertUpdateRemark("将取消改回来原来的车状态不变!");
|
|
|
+ if(tel != null && !"".equals(tel)){
|
|
|
+ omstruckOrder.setDriverTel(tel);
|
|
|
+ }
|
|
|
|
|
|
result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
}else{
|
|
|
OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
|
omstruckOrder.setOrderId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(5));
|
|
|
+ if(tel != null && !"".equals(tel)){
|
|
|
+ omstruckOrder.setDriverTel(tel);
|
|
|
+ }
|
|
|
omstruckOrder.setInsertUpdateRemark("将取消改回来原来的车状态不变!");
|
|
|
|
|
|
result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
@@ -2179,6 +2183,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", omstruckOrderMapper.selectMaxId().intValue()));
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(4));
|
|
|
omstruckOrder.setOrderLineSequence(new BigDecimal(0));
|
|
|
+ if(tel != null && !"".equals(tel)){
|
|
|
+ omstruckOrder.setDriverTel(tel);
|
|
|
+ }
|
|
|
|
|
|
result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
|
|
@@ -2190,6 +2197,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
}else{
|
|
|
OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
|
omstruckOrder.setOrderId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
|
|
|
+ if(tel != null && !"".equals(tel)){
|
|
|
+ omstruckOrder.setDriverTel(tel);
|
|
|
+ }
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(7));
|
|
|
omstruckOrder.setInsertUpdateRemark("取消车牌号,保留实绩将状态变为7");
|
|
|
result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|