Merge branch 'dev'

src/main/java/com/steerinfo/dil/mapper/StatisticalReportMapper.java

@@ -12,7 +12,7 @@ import java.util.Map;
  */
 @Mapper
 public interface StatisticalReportMapper {
-    //查询采购统计报表 (辅料、燃料、内转)
+    //查询采购统计报表 (辅料、燃料、内转、化工材料)
     List<Map<String, Object>> getAllPurchaseFLRLReport(Map<String, Object> map);
 
     //查询销售统计报表

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

@@ -139,17 +139,21 @@ public class RulesServiceImpl implements IRulesService {
                     }
                 }
             }
+            if(orderType == 17 || orderType == 18){ // 化工材料采购 现只考虑化工厂
+                return 16;
+            }
             return 0;
         }
-        List<Integer> calculateList = queryTruckCalculate(map);
-        //暂时不考虑优先级 随机进行取值
-        int size = calculateList.size();
-        if(size == 0){
-            return 13; //没有查询到汽车衡  则使用备用秤
-        }if(size == 1){
-            return calculateList.get(0);
-        }
-        return calculateList.get(new Random().nextInt(size));
+//        List<Integer> calculateList = queryTruckCalculate(map);
+//        //暂时不考虑优先级 随机进行取值
+//        int size = calculateList.size();
+//        if(size == 0){
+//            return 13; //没有查询到汽车衡  则使用备用秤
+//        }if(size == 1){
+//            return calculateList.get(0);
+//        }
+//        return calculateList.get(new Random().nextInt(size));
+        return 0;
     }
 
     /**
@@ -339,6 +343,9 @@ public class RulesServiceImpl implements IRulesService {
                 return 10;
             }
         }
+        if(orderType == 17 || orderType == 18){ // 化工材料采购 现只考虑化工厂
+            return 12;
+        }
         return 0;
     }
 }

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

@@ -43,7 +43,13 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         }
     }
 
-    //查询辅料燃料统计报表
+    /**
+     * 查询采购统计报表
+     * @Author TXF
+     * @Date 2022/1/6 9:52
+     * @param map
+     * @return
+     **/
     public List<Map<String, Object>> getRLFLReport(Map<String, Object> map){
         List<Map<String, Object>> mapList = statisticalReportMapper.getAllPurchaseFLRLReport(map);
         for (Map<String, Object> mesMap : mapList) {

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

@@ -107,6 +107,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 return tmstruckEnfactoryResultMapper.getCGJKEnFactoryResult(map); //apiID: 99
             case 9:
                 return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
@@ -205,6 +207,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 7:
             case 8:
             case 9:
+            case 17:
+            case 18:
                 //计算计毛汽车衡并更新计量实绩 (暂时无法计算汽车衡)  需要写一个单独的方法 先计皮再计毛的
                 HashMap<String, Object> calculateMap56789 = new HashMap<>();
                 calculateMap56789.put("orderId", map.get("orderId"));

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

@@ -127,6 +127,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 return tmstruckLeaveFactoryResultMapper.getCGLeaveFactoryResult(map); //apiId:110
             case 9:
                 return tmstruckLeaveFactoryResultMapper.getImportedDomesticNzEnFactoryResult(map); //apiId:110
@@ -184,6 +186,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 7:
             case 8:
             case 9:
+            case 17:
+            case 18:
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
 //                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中

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

@@ -265,6 +265,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseDXMeasure(map);
                 if(measureCommission == null)
                     return 0;
@@ -312,7 +314,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 14:
         }
         /*访问接口发送数据*/
-        return sendMesToDXMeasure(measureCommission);
+//        return sendMesToDXMeasure(measureCommission);
+        System.out.println(measureCommission);
+        return 1;
     }
 
     /**

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

@@ -56,6 +56,8 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 return tmstruckReceiptResultMapper.getCGReceiptResult(map); //apiId: 107
             case 9:
             case 10:

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

@@ -106,6 +106,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 return tmstruckUnloadResultMapper.getCGUnloadResult(map); //apiId:103
             case 9:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnloadResult(map); //apiId:355
@@ -160,6 +162,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 7:
             case 8:
             case 9:
+            case 17:
+            case 18:
                 //计算计皮汽车衡 (当前无法计算汽车衡)
                 int placeId = rulesService.calculateWeighbridge(mesMap);
                 mesMap.put("tarePlaceId", placeId);

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

@@ -48,26 +48,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Autowired
     private UtilsServiceImpl utilsService;
 
-    @Autowired
-    private UtilsMapper utilsMapper;
-
-    @Autowired
-    private QmsFeign qmsFeign;
-
     @Autowired
     private RulesServiceImpl rulesService;
 
-    @Autowired
-    private RulesMapper rulesMapper;
 
     @Autowired
     OmsFeign omsFeign;
 
-    @Autowired
-    private TmstruckLoadResultServiceImpl tmstruckLoadResultService;
-
-    @Autowired
-    private TmstruckLeaveFactoryResultServiceImpl tmstruckLeaveFactoryResultService;
     /**
      * 查询所有计毛实绩
      * @param map
@@ -88,6 +75,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 return tmstruckWeightResultMapper.getCGAllJiMaoResult(map); //apiId:102
             case 9:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMaoResult(map); // apiID:354
@@ -122,6 +111,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 return tmstruckWeightResultMapper.getCGAllJiPiResult(map); // apiId: 104
             case 9:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiPiResult(map);// apiId: 104

src/main/resources/application-dev.yml

@@ -37,7 +37,7 @@ openfeign:
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8018}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 server:
   port: 8008

src/main/resources/application-prod.yml

@@ -38,7 +38,7 @@ openfeign:
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.166:8047}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.161:8055}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 server:
   port: 8088