opt:代码优化

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

@@ -13,6 +13,7 @@ import org.nl.b_lms.sch.point.dao.StIvtCutpointivt;
 import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.TaskUtils;
 import org.nl.modules.wql.WQL;
@@ -114,6 +115,10 @@ public class DownShaftTrussTask extends AbstractAcsTask {
             TaskUtils.updateOptMessageByBCutPoint(point2);
             bcutpointivtService.updateById(point2);
         }
+        // 取消
+        if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+            task.setTask_status(TaskStatusEnum.FINISHED.getCode());
+        }
         task.setUpdate_time(DateUtil.now());
         taskService.updateById(task);
     }

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

@@ -28,8 +28,8 @@ public class SlitterTaskUtil {
 
     /** B1区域 */
     public final static String B1_AREA_CODE = "B1";
-    /** B2区域 */
-    public final static String B2_AREA_CODE = "B2";
+    /** A1区域 */
+    public final static String A1_AREA_CODE = "A1";
     /**
      * 组成纸管信息
      * @param plan 对应的分切计划数组
@@ -226,8 +226,8 @@ public class SlitterTaskUtil {
                 return "0";
             }
         }
-        if (area.equals(B2_AREA_CODE)) {
-            if (num >= 1 && num <= 5) {
+        if (area.equals(A1_AREA_CODE)) {
+            if (num >= 1 && num <= 6) {
                 return "0";
             }
         }