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

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

@@ -122,6 +122,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 13:
             case 15:
             case 16:
+            case 19:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
         }
         return null;

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

@@ -148,6 +148,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 13:
             case 15:
             case 16:
+            case 19:
                  return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
         }
         return null;

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

@@ -112,6 +112,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 13:
             case 15:
             case 16:
+            case 19:
                  return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 430
         }
         return null;

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

@@ -311,6 +311,19 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("packagesNum", 0);
                 break;
             case 15:
+                //零星计量委托(老厂区)  会有多拼
+                measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
+                if(measureCommission == null){
+                    return 0;
+                }
+                measureCommission.put("isRelationEAS",false);
+                measureCommission.put("flowTo","进厂");
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                System.out.println(measureCommission);
+                break;
             case 16:
                 //零星计量委托(老厂区)  会有多拼
                 measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
@@ -323,6 +336,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("isInsert", true);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
+                System.out.println(measureCommission);
                 break;
             case 20://采购内转委托总厂区
                 measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);

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

@@ -122,6 +122,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 13:
             case 15:
             case 16:
+            case 19:
                 return  tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
         }
         return null;

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

@@ -137,6 +137,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 13:
             case 15:
             case 16:
+            case 19:
                 return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map); //apiId:405
 
         }
@@ -178,6 +179,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 15:
             case 20:
             case 16:
+            case 19:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
         }
         return null;