3.17

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

@@ -157,7 +157,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         String capacityNumber = (String) mesMap.get("capacityNumber");
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
         Integer orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
-        if(orderType == 11||orderType == 22){
+        if(orderType == 11){
             //内转订单类型  没有生成实绩 直接新增
             Integer sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
             sqe = sqe + 1;

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

@@ -143,7 +143,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 20:
                 return tmstruckEnfactoryResultMapper.getCgNzOutFactory(map);
             case 11:
-            case 22:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
             case 12:
             case 13:
@@ -172,7 +171,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
         Integer orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         String capacityNumber = (String) mesMap.get("capacityNumber");
-        if(orderType == 11||orderType == 22){
+        if(orderType == 11){
             //内转订单类型 没有生成实绩 直接新增
             Integer sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
             sqe = sqe + 1;

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

@@ -107,7 +107,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 20:
                 return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
-            case 22:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
             case 12:
             case 13:
@@ -265,7 +264,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         String capacityNumber = (String) mesMap.get("capacityNumber");
         BigDecimal orderType = DataChange.dataToBigDecimal(mesMap.get("orderType"));
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
-        if(orderType.intValue() == 11||orderType.intValue() == 22){
+        if(orderType.intValue() == 11){
             Integer sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
             sqe = sqe + 1;
             map.put("resultId",tmstruckLoadResultMapper.selectMaxId());

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

@@ -250,7 +250,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("packagesNum", 0);
                 break;
             case 11:
-            case 22:
                 //纯内转发送计量委托
                 measureCommission = tmstruckMeasureCommissionMapper.purchaseNzMeasure(map);
                 if(measureCommission == null){
@@ -268,6 +267,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", false);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
+                System.out.println(measureCommission);
                 break;
             case 12:
             case 13:
@@ -330,7 +330,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         addMeasureCommission(map); // 添加计量委托
 
         /*访问接口发送数据*/
-        return sendMesToMeasure(measureCommission);
+//        return sendMesToMeasure(measureCommission);
+        return 1;
 
     }
 
@@ -510,7 +511,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 8:
             case 10:
             case 11:
-            case 22:
             case 17:
             case 18:
                 i+=addMaoMeasureCommission(map);

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

@@ -117,7 +117,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 20:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnload2Result(map); //apiId:356
             case 11:
-            case 22:
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360
             case 12:
             case 13:

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

@@ -132,7 +132,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 20:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMao2Result(map); // apiID:354
             case 11:
-            case 22:
                 return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358
             case 12:
             case 13: