opt:优化定时器

lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml

@@ -223,6 +223,13 @@
         WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07'
         AND t.is_delete = '0'
         AND  (t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1))
+        group by bic.ivt_id,
+        bic.point_code,
+        bic.qzz_no1,
+        bic.truss_point_code1,
+        p.qzz_generation,
+        bic.product_area,
+        p.qzz_size
         UNION all
         SELECT  bic.ivt_id,
         bic.point_code,
@@ -242,6 +249,13 @@
         FROM sch_base_task t
         WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07'
         AND t.is_delete = '0'
-        AND  (t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2));
+        AND  (t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2))
+          group by bic.ivt_id,
+        bic.point_code,
+        bic.qzz_no2,
+        bic.truss_point_code2,
+        p.qzz_generation,
+        bic.product_area,
+        p.qzz_size
     </select>
 </mapper>

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java

@@ -150,8 +150,11 @@ public class StockAreaSendVehicleTask extends AbstractAcsTask {
         task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
         task.setPoint_code1(form.getString("point_code1"));
         task.setPoint_code2(form.getString("point_code2"));
-        task.setPoint_code3(callPoint.getString("point_code"));
+        task.setPoint_code3(ObjectUtil.isNotEmpty(callPoint)
+                ? callPoint.getString("point_code")
+                : "");
         task.setVehicle_code(form.getString("vehicle_code"));
+        task.setVehicle_code2(form.getString("vehicle_code2"));
         task.setAcs_task_type("3");
         task.setIs_delete("0");
         task.setRemark("point3只是记录点，不会下到ACS");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java

@@ -23,7 +23,7 @@ public enum SlitterEnum {
             , "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807"
             , "备货区送纸管", "010808", "分切机下料桁架任务", "010809", "分切机下料AGV到内包间", "010810", "套轴异常处理AGV任务", "010811"
     , "套轴异常处理桁架任务", "010812", "送气胀轴到分切机任务", "010813", "拔轴完毕出轴", "010814", "穿拔轴缓存<>气胀轴缓存位", "010815",
-            "托盘入管芯库任务", "010816","管芯备货任务", "010817","托盘回收任务", "010818"));
+            "备货区单独送空载具", "010816","管芯备货任务", "010817","托盘回收任务", "010818","托盘入管芯库任务", "010819"));
     private Map<String, String> code;
 
     public String code(String desc) {