代码更新

nladmin-system/nlsso-server/pom.xml

@@ -34,7 +34,6 @@
 
     <dependencies>
 
-
         <!--工具包-->
         <dependency>
             <groupId>cn.hutool</groupId>

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java

@@ -50,4 +50,5 @@ public interface ISchBasePointService extends IService<SchBasePoint> {
     void changeUsed(JSONObject jsonObject);
 
     List<SchBasePoint> getPointList(SchBasePoint region);
+
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java

@@ -29,7 +29,8 @@ public abstract class AbstractTask {
     private ISchBaseTaskService taskService;
 
     /**
-     * 创建
+     * 任务创建
+     * 根据配置生成任务，如并发控制等
      */
     protected abstract void create();
 
@@ -126,7 +127,7 @@ public abstract class AbstractTask {
     /**
      * 定时任务
      */
-    protected void schedule() {
+    public void schedule() {
         this.autoCreate();
         this.create();
     }
@@ -158,7 +159,7 @@ public abstract class AbstractTask {
         SchBaseTaskServiceImpl taskService = SpringContextHolder.getBean(SchBaseTaskServiceImpl.class);
         List<SchBaseTask> unFinishTasksByTaskConfig = taskService.findUnFinishTasksByTaskConfig(taskConfig.getConfig_code());
 
-        Assert.isFalse(unFinishTasksByTaskConfig.size() > tcmn, "该点位{}申请的任务未完成数已超过上限，无法申请任务", point_code);
+        Assert.isFalse(unFinishTasksByTaskConfig.size() > tcmn, "该点位申请的任务未完成数已超过上限，无法申请任务");
 
 
         SchBaseTask task = new SchBaseTask();

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java

@@ -1,6 +1,7 @@
 package org.nl.wms.sch.task_manage.task.tasks;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.config.SpringContextHolder;
 import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
@@ -12,7 +13,6 @@ import org.nl.wms.sch.task.service.impl.SchBaseTaskServiceImpl;
 import org.nl.wms.sch.task.service.impl.SchBaseTaskconfigServiceImpl;
 import org.nl.wms.sch.task_manage.AbstractTask;
 import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.springframework.scheduling.support.TaskUtils;
 
 import java.util.List;
 
@@ -40,33 +40,43 @@ public class HNMLTask extends AbstractTask {
 
         SchBaseTaskconfig taskConfig = SpringContextHolder.getBean(SchBaseTaskconfigServiceImpl.class).getById(TASK_CONFIG_CODE);
         for (SchBaseTask task : tasks) {
-            List<String> next_region_strs = taskConfig.getNext_region_strs();
-            if (ObjectUtil.isEmpty(next_region_strs)) continue;
+            String[] nextRegionStr = taskConfig.getNext_region_str().split(",");
 
 
-            SchBasePoint point = new SchBasePoint();
+            SchBasePoint point = getSchBasePoint(pointService, nextRegionStr);
+            if (ObjectUtil.isEmpty(point)) continue;
+
             task.setPoint_code2(point.getPoint_code());
 
+
             taskService.update(task);
+
+            point.setIng_task_code(task.getTask_code());
             pointService.update(point);
+
+            //下发
             this.renotifyAcs(task);
-            //二车间-
 
         }
 
     }
 
+    private SchBasePoint getSchBasePoint(ISchBasePointService pointService, String[] nextRegionStr) {
+        for (String nextRegion : nextRegionStr) {
+            LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
+            lam.eq(SchBasePoint::getRegion_code, nextRegion)
+                    .eq(SchBasePoint::getPoint_status, "1");
+            SchBasePoint p = pointService.getBaseMapper().selectOne(lam);
+            if (p != null) return p;
+        }
+        return null;
+    }
+
     @Override
     protected void issue() {
 
     }
 
-    @Override
-    protected void schedule() {
-
-    }
-
-
     @Override
     protected List<Object> findPoints() {
         return null;