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

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

@@ -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 {
             // 运输线路id
             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();
-            }
+            //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();
-        }
+        //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);
+                        }
                         /*omstruckOrder.set*/
                         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("将取消改回来原来的车状态不变!");
                         /*omstruckOrder.set*/
                         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);
+                    }
                         /*omstruckOrder.set*/
                     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);
@@ -2875,7 +2885,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrderMaterial.setSaleDateOfReceipt(dateOfReceipt);
                 amsSaleOrderMaterial.setInsertTime(new Date());
                 amsSaleOrderMaterial.setUpdateTime(new Date());
-                amsSaleOrderMaterial.setInsertUpdateRemark("物流新增");
+                amsSaleOrderMaterial.setInsertUpdateRemark("物流新增继续装");
+                amsSaleOrderMaterial.setWarrantyNumber(new BigDecimal(1));
                 result += amsSaleOrderMaterialMapper.insertSelective(amsSaleOrderMaterial);
             }
             else {