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

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

@@ -60,8 +60,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     //属于采购订单的订单类型（先计毛后计皮）
     final private List<Integer> judgeOrderTypeList = Arrays.asList(5, 6, 7, 8, 9, 12, 15, 17, 18);
 
+
     //老厂区需要给金蝶回传的数据订单类型
-//    final private List<Integer> judgeToKDTypeList = Arrays.asList(6, 17);
+    final private List<Integer> judgeToKDTypeList = Arrays.asList(5,6,7,8,17,18);
 
     /**
      * 接收达钢计量实绩信息
@@ -155,7 +156,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         if(map.get("needCheckToKD") != null){
             if(map.get("resultNetWeight") != null){
                 Object resultCrossWeightTime = map.get("resultCrossWeightTime");
-                if ( orderType == 6 && resultCrossWeightTime != null && !"".equals(resultCrossWeightTime)) {
+                if (judgeToKDTypeList.contains(orderType) && resultCrossWeightTime != null && !"".equals(resultCrossWeightTime)) {
                     String resultNetWeight = String.valueOf(map.get("resultNetWeight")); //如果净重不为空  或者净重不为0
                     if (!"null".equals(resultNetWeight) && !"".equals(resultNetWeight) && !"0".equals(resultNetWeight)) {
                         //回传数据给金蝶方法