Merge branch '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;
@@ -219,13 +220,10 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
 //            case 8:
 //            case 9:
             case 10:
-//            case 11:
-//            case 17:
+            case 17:
             case 18:
                 checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
-//            case 11:
-//                break;
             case 12:
             case 13:
             case 16:

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

@@ -42,41 +42,24 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     UtilsMapper utilsMapper;
     @Autowired
     private RulesServiceImpl rulesService;
-   /**
+
+    private static final  String daGangUrl = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
+
+    private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
+
+    //给达钢发送委托
+    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17);
+
+    //给达兴发委托
+    private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18);
+
+    /**
      * 查询计量委托 0 ：计皮     1：计毛
      * @param map orderTypee 订单类型   type 是计皮还是计毛
      * @return
      */
     @Override
     public List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map) {
-        Integer orderType = (Integer) map.get("orderTypee");
-        switch (orderType){
-            case 1:
-
-                break;
-            case 2:
-
-                break;
-            case 3:
-
-                break;
-            case 4:
-
-                break;
-            case 5:
-                break;
-            case 6:
-                break;
-            case 7:
-                break;
-            case 8:
-                return tmstruckMeasureCommissionMapper.getMeasureCommission(map);
-            case 9:
-                break;
-            case 10:
-                break;
-            case 11:
-        }
         return null;
     }
 
@@ -95,16 +78,16 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             //获取当前订单是属于哪个厂区订单
             Integer receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByRequirementOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
             if(receiveId == 1){
-                i += sendMeasureCommissionMes(map);  //发送委托给达州钢铁
+                i = sendMeasureCommissionMes(map);  //发送委托给达州钢铁
             }else if(receiveId == 2) {
-                i += sendDXMeasureCommissionMes(map); //发送委托给达兴能源
+                i = sendDXMeasureCommissionMes(map); //发送委托给达兴能源
             }
-        }else if(orderType == 6 || orderType == 5 || orderType == 11){
+        }else if(judgeDaGangNum.contains(orderType)){
             //发送委托给达州钢铁
-            i += sendMeasureCommissionMes(map);
-        }else if(orderType == 18 || orderType == 7) {
+            i = sendMeasureCommissionMes(map);
+        }else if(judgeDaXinNum.contains(orderType)) {
             //发送委托给达兴能源
-            i += sendDXMeasureCommissionMes(map);
+            i = sendDXMeasureCommissionMes(map);
         }
 
         return i;
@@ -242,17 +225,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
                 break;
-            case 3:
-                break;
-            case 10:
-                break;
-            case 4:
-                break;
             case 5:
             case 6:
-            case 7:
             case 8:
-//            case 9:
+            case 17:
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseMeasure(map);
                 if(measureCommission == null){
                     return 0;
@@ -307,6 +283,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);
@@ -319,6 +308,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);
@@ -336,8 +326,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             map.put("materialId", measureCommission.get("materialId"));
         addMeasureCommission(map); // 添加计量委托
 //        System.out.println(measureCommission);
-        /*访问接口发送数据*/
 //        return 1;
+        /*访问接口发送数据*/
         return sendMesToMeasure(measureCommission);
 
     }
@@ -364,13 +354,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("crname", "admin");
                 measureCommission.put("ended", "0");
                 break;
-            case 4:
-                break;
-            case 5:
-            case 6:
             case 7:
-            case 8:
-            case 17:
             case 18:
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseDXMeasure(map);
                 if(measureCommission == null)
@@ -379,8 +363,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("billType", "0");
                 measureCommission.put("crname", "admin");
                 measureCommission.put("ended", "0");
-            case 9:
-                break;
             case 10:
             case 20:
                 //新区采购内转
@@ -403,8 +385,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 }
                 measureCommission.put("ended", "0");
                 break;
-            case 11:
-                break;
             case 12:
             case 13:
             case 15:
@@ -440,11 +420,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         sendMap.add(map);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("data", sendMap);
-
-        String url = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
         String jsonData = null;
         try {
-            jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
+            jsonData = HTTPRequestUtils.send(daGangUrl, jsonObject, "utf-8");
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -471,10 +449,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     public int sendMesToDXMeasure(Map<String, Object> map){
         JSONObject jsonObject = new JSONObject();
         jsonObject.putAll(map);
-        String url = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
         String jsonData = null;
         try {
-            jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
+            jsonData = HTTPRequestUtils.send(daXingUrl, jsonObject, "utf-8");
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -547,17 +524,15 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 5:
             case 6:
             case 7:
-//            case 8:
+            case 8:
 //            case 9:
             case 10:
             case 11:
-                i += addNZMeasureCommission(map);
-                break;
-//            case 17:
+            case 17:
             case 18:
                 i+=addMaoMeasureCommission(map);
         }
-        if(i == 1){
+        if(i == 1 && orderType.intValue() == 11){
             //发送委托成功后修改订单物资表
             tmstruckMeasureCommissionMapper.updateOmsTruckMaterial(map);
             if(map.get("deletedCommission") != null){
@@ -567,17 +542,4 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         return i;
     }
 
-    /**
-     * 添加内转委托
-     * @Author TXF
-     * @Date 2022/2/19 12:23
-     * @param map
-     * @return
-     **/
-    public int addNZMeasureCommission(Map<String, Object> map){
-        int i = 0;
-        addMeasureCommission(map); // 添加计毛委托
-        i += sendMeasureCommissionMes(map); //往老厂区发送委托
-        return i;
-    }
 }

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;

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/truckTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8