修改

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

@@ -143,7 +143,7 @@ public class KDWebServiceServiceImpl {
      * @param
      * @return
      **/
-    //@Scheduled(fixedRate = 1000 * 60 * 10)
+    @Scheduled(fixedRate = 1000 * 60 * 10)
     public void timingPushMesToKD(){
         List<Map<String, Object>> allNotUploadedEasMes = amsNotUploadedEasMapper.getAllNotUploadedEasMes();
         if(allNotUploadedEasMes != null && allNotUploadedEasMes.size() != 0){

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.feign.TmstruckFeign;
 import com.steerinfo.dil.mapper.*;
@@ -124,26 +125,26 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      */
     public String addTruckWeightResult(Map<String, Object> map) {
         System.out.println("---------------------------------" + new Date() + "新接收到的计量实绩" + "---------------------------------");
-        System.out.println(map);
+        JSONObject jsonObject = new JSONObject(map);
+        System.out.println(jsonObject);
         System.out.println("---------------------------------" + new Date() + "新接收到的计量实绩"  + "---------------------------------");
+        if(map.get("flag") != null && map.get("flag").equals("GCXS")){
+            System.out.println("这是钢材销售");
+            TmstruckWeightResult tmstruckWeightResult = null;
+            try {
+                tmstruckWeightResult = generateSteelWeightResult(map);
+                tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+                utilsService.pushMesToWebsocket((String) map.get("carNo"), "计量");
+                return map.get("carNo") + "传输成功";
+            } catch (Exception e) {
+                System.out.println(map.get("carNo") + "传输失败");
+                return map.get("carNo")  + e.getMessage() + "传输失败";
+            }
+        }
         //首先通过运输订单号查询订单类型
         Map<String, Object> oneMap = utilsMapper.getOrderTypeByOrderNumber((String) map.get("orderNumber")); //用于判断订单类型
         if(oneMap == null){
-            if(map.get("flag") != null && map.get("flag").equals("GCXS")){
-                System.out.println("这是钢材销售走补录金蝶的那边");
-                TmstruckWeightResult tmstruckWeightResult = null;
-                try {
-                    tmstruckWeightResult = generateSteelWeightResult(map);
-                    tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
-                    utilsService.pushMesToWebsocket((String) map.get("carNo"), "计量");
-                    return map.get("carNo") + "传输成功";
-                } catch (Exception e) {
-                    System.out.println(map.get("carNo") + "传输失败");
-                    return map.get("carNo")  + e.getMessage() + "传输失败";
-                }
-            }else{
-                return map.get("orderNumber") + "系统无此订单";
-            }
+            return map.get("orderNumber") + "系统无此订单";
         }
         int orderType= DataChange.dataToBigDecimal(oneMap.get("orderType")).intValue();
         if(orderType == 11 || orderType == 15 || orderType == 16){