'司机接单'

src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -152,7 +152,7 @@ public interface IOmstruckOrderService {
     List<Map<String, Object>> getCapacityAndDriverList(Map<String, Object> mapValue);
     //关闭运输订单
     int closeOrder(Map<String,Object> map);
-    // 新增内转运输订单
+    // 分解内转计划（新增运输订单）
     int addInwardOrder(Map<String, Object> mapValue);
     // 查询分解计划
     List<Map<String, Object>> getInwardOrderList(Map<String, Object> mapValue);

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

@@ -1095,6 +1095,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public int addAppTruckOrder(Integer dispatchId, Integer orderType, String capacityNumber, Integer carrierId) {
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         BigDecimal orderId = omstruckOrderMapper.selectMaxId();
+        Map<String,Object> orderIdMap = new HashMap<>();
+        orderIdMap.put("orderId",orderId);
+        tmsTruckFeign.addTotalResult(orderIdMap);
         omstruckOrder.setOrderId(orderId);
         BigDecimal saleOrderMaterialId = omstruckOrderMapper.getSaleMaterialId(new BigDecimal(dispatchId));
         omstruckOrder.setOrderPlanId(saleOrderMaterialId);
@@ -1178,7 +1181,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     }
 
     /**
-     * 新增内转运输订单
+     * 分解内转计划（新增运输订单）
      * @param mapValue
      * @return
      */
@@ -1214,6 +1217,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             rmsDriverCapacity.setCarrierId(new BigDecimal(carrierId));
             result +=rmsDriverCapacityMapper.updateByPrimaryKeySelective(rmsDriverCapacity);
             BigDecimal orderId = omstruckOrderMapper.selectMaxId();
+            // 添加总实绩
+            Map<String,Object> orderIdMap = new HashMap<>();
+            tmsTruckFeign.addTotalResult(orderIdMap);
             omstruckOrder.setOrderId(orderId);
             omstruckOrder.setOrderPlanId(new BigDecimal(planId));
             String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
@@ -1289,17 +1295,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             OmstruckOrder omstruckOrder = omstruckOrderMapper.selectByPrimaryKey(orderId);
             omstruckOrder.setOrderIssueTime(new Date());
             omstruckOrder.setOrderStatus(new BigDecimal(4));
-            Map<Object, Object> map9 = new HashMap<>();
-            long data = new Date().getTime();
-            //根据运输订单id查询车牌号
-            String capacityNumber = omstruckOrderMapper.selectCapacityNumber(orderId);
-            BigDecimal orderType = omstruckOrderMapper.selectOrderType(orderId);
-
-            map9.put("receivePerson",capacityNumber);
-            map9.put("messageType",2);
-            map9.put("snedPerson","system");
-            map9.put("creatTime",data);
-
+//            Map<Object, Object> map9 = new HashMap<>();
+//            long data = new Date().getTime();
+//            //根据运输订单id查询车牌号
+//            String capacityNumber = omstruckOrderMapper.selectCapacityNumber(orderId);
+//            BigDecimal orderType = omstruckOrderMapper.selectOrderType(orderId);
+            pushMesToWebsocket(map);
             result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         }
         return result;
@@ -1321,28 +1322,36 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             BigDecimal orderType = (BigDecimal) map.get("orderType");
             // 查询物资信息
             List<Map<String,Object>> materialMapList = omstruckOrderMapper.getMaterialMes(orderId);
-            int intValue = orderType.intValue();
-            String allMaterialName = null;
-            String allMaterialNumber = null;
-            String allMaterialWeight = null;
-            String allMaterialSpecificationModel = null;
+            String allMaterialName = "";
+            String allMaterialNumber = "";
+            String allMaterialWeight = "";
+            String allMaterialSpecificationModel = "";
             // 对物资信息进行处理
-            if (materialMapList != null && materialMapList.size() != 0) {
+            if (materialMapList == null && materialMapList.size() == 0) {
+            } else {
                 for (Map<String,Object> materialMap : materialMapList) {
                     String materialName = (String) materialMap.get("materialName");
-                    BigDecimal materialNumber = (BigDecimal) materialMap.get("materialNumber");
-                    BigDecimal materialWeight = (BigDecimal) materialMap.get("materialWeight");
+                    BigDecimal materialNumber =  (BigDecimal) materialMap.get("materialNumber");
+                    BigDecimal materialWeight =  (BigDecimal) materialMap.get("materialWeight");
                     String materialModel = (String) materialMap.get("materialModel");
                     String materialSpecification = (String) materialMap.get("materialSpecification");
-                    allMaterialName += materialName + "/";
-                    allMaterialNumber += materialNumber + "/";
-                    allMaterialWeight += materialWeight + "/";
-                    allMaterialSpecificationModel += materialSpecification + materialModel + "/";
+                    if (materialName != null) {
+                        allMaterialName += materialName + "/";
+                    }
+                    if (materialNumber != null) {
+                        allMaterialNumber += materialNumber.toString() + "/";
+                    }
+                    if (materialWeight != null) {
+                        allMaterialWeight += materialWeight.toString() + "/";
+                    }
+                    if (materialSpecification != null || materialModel != null) {
+                        allMaterialSpecificationModel += materialSpecification + materialModel + "/";
+                    }
                 }
-                String subMaterialName = null;
-                String subMaterialNumber = null;
-                String subMaterialWeight = null;
-                String subMaterialSpecificationModel = null;
+                String subMaterialName = "";
+                String subMaterialNumber = "";
+                String subMaterialWeight = "";
+                String subMaterialSpecificationModel = "";
                 if (allMaterialName.length() >= 2) {
                     subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
                 }
@@ -1350,13 +1359,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     subMaterialName = allMaterialName;
                 }
                 if (allMaterialNumber.length() >= 2) {
-                    subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
+                    subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 1);
                 }
                 if (allMaterialNumber.length() < 2) {
                     subMaterialNumber = allMaterialNumber;
                 }
                 if (allMaterialWeight.length() >= 2) {
-                    subMaterialWeight = allMaterialWeight.substring(0, allMaterialWeight.length() - 2);
+                    subMaterialWeight = allMaterialWeight.substring(0, allMaterialWeight.length() - 1);
                 }
                 if (allMaterialWeight.length() < 2) {
                     subMaterialWeight = allMaterialWeight;
@@ -1373,6 +1382,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 map.put("allMaterialSpecificationModel", subMaterialSpecificationModel);
             }
             Map<String,Object> orderMap = null;
+            int intValue = orderType.intValue();
             if (intValue == 1 || intValue == 2 || intValue == 3) {
                 orderMap = omstruckOrderMapper.getSaleOrderMap(orderId);
             }

src/main/resources/bootstrap.yml

@@ -49,7 +49,7 @@ openfeign:
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.161:8079}
   Im:
-    url: ${AMSFEIGN_URL:localhost:8888}
+    url: ${AMSFEIGN_URL:172.16.33.161:8888}
 
 mybatis:
   type-aliases-package: com.steerinfo.dil.model