Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -233,11 +233,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 if(measureCommission == null){
                     return 0;
                 }
-                if(orderType == 6){
-                    measureCommission.put("isRelationEAS", false);
-                }else {
-                    measureCommission.put("isRelationEAS", true);
-                }
+                measureCommission.put("isRelationEAS", true);
                 measureCommission.put("flowTo", "进厂");
                 measureCommission.put("isDel", false);
                 measureCommission.put("isInsert", true);
@@ -363,6 +359,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("billType", "0");
                 measureCommission.put("crname", "admin");
                 measureCommission.put("ended", "0");
+                break;
             case 10:
             case 20:
                 //新区采购内转