修改统计报表和门岗汽车衡规则

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/resources/bootstrap.yml

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