type=4::一车间缓存区到涂板线 TBXBKJ

type=7:二车间缓存区到涂板线  TBXBKJ
type=3:一车间缓存区到包片机 BPSL
type=8:二车间缓存区到人工出库位 ZJBSL
type=5: 一车间涂板线到固化室    MJXL
type=6:一车间固化室到缓存区  GHSQH
type=9: 二车间涂板线到固化室  MJXL
type=10: 二车间固化室到缓存区  GHSQH
type=11: 一车间包片机到堆叠位  KGHJRK
type=12：一车间包片机到缓存区  KGHJRK

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java

@@ -1,6 +1,7 @@
 package org.nl.wms.sch.task.service.dao;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
@@ -126,4 +127,7 @@ public class SchBaseTask implements Serializable {
     @ApiModelProperty(value = "点位2高度")
     private String point_code2_height="0";
 
+    @TableField(exist = false)
+    private String task_type;
+
 }

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

@@ -87,7 +87,7 @@ public abstract class AbstractTask {
             taskDto.setStart_device_code(task.getPoint_code1());
             taskDto.setNext_device_code(task.getPoint_code2());
             taskDto.setVehicle_code(task.getVehicle_code());
-
+            taskDto.setTask_type(task.getTask_type());
             this.setTask(task.getConfig_code(), taskDto);
             list.add(taskDto);
         }
@@ -99,7 +99,7 @@ public abstract class AbstractTask {
         SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
                 .eq(SchBaseTaskconfig::getConfig_code, config_code));
         taskDto.setPriority(taskConfig.getPriority());
-        taskDto.setTask_type(taskConfig.getTask_type());
+//        taskDto.setTask_type(taskConfig.getTask_type());
         taskDto.setRoute_plan_code(taskConfig.getRoute_plan_code());
         return taskDto;
     }

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

@@ -89,6 +89,7 @@ public class BPSLTask extends AbstractTask {
             }
             // 设置起点并修改创建成功状态
             // 取料先去等待点
+            task.setTask_type("3");
             task.setPoint_code1(point.getStart_wait_point());
             task.setTask_status(TaskStatus.CREATED.getCode());
             task.setRemark("");

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

@@ -85,6 +85,11 @@ public class KGHJRKTask extends AbstractTask {
                 continue;
             }
             // 设置终点并修改创建成功状态
+            if("1".equals(task.getVehicle_type())){
+                task.setTask_type("11");
+            }else{
+                task.setTask_type("12");
+            }
             task.setPoint_code2(point.getNext_wait_point());
             task.setTask_status(TaskStatus.CREATED.getCode());
             task.setRemark("");

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

@@ -91,6 +91,10 @@ public class MJXLTask extends AbstractTask {
                 log.info("满架下料未找到当前符合条件的点位materialType:{},", materialType);
                 continue;
             }
+            task.setTask_type("5");
+            if("TBX2".equals(startPoint.getRegion_code())){
+                task.setTask_type("9");
+            }
             // 设置终点并修改创建成功状态
             task.setPoint_code2(point.getNext_wait_point());
             task.setTask_status(TaskStatus.CREATED.getCode());

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

@@ -92,6 +92,11 @@ public class TBXBKJTask extends AbstractTask {
                 continue;
             }
             // 设置终点并修改创建成功状态
+            if("TBX1".equals(startPoint.getRegion_code())) {
+                task.setTask_type("4");
+            }else{
+                task.setTask_type("7");
+            }
             task.setPoint_code1(point.getNext_wait_point());
             task.setTask_status(TaskStatus.CREATED.getCode());
             task.setRemark("");

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

@@ -184,6 +184,7 @@ public class GHSFMTask extends AbstractTask {
         task.setWorkshop_code(taskConfig.getWorkshop_code()); // 车间编码
         //acs固化室首位不存在01和06整体概念，需要补充01生成第一个点位的任务
         task.setPoint_code1(apply_point_code + "01");
+        task.setTask_type("2");
         task.setPoint_code2(endPoint);
         task.setTask_status(TaskStatus.CREATED.getCode());
         task.setRemark("");

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

@@ -147,13 +147,18 @@ public class GHSQHTask extends AbstractTask {
         task.setCreate_mode(GeneralDefinition.ACS_CREATION);
         task.setVehicle_code(schBasePoint.getVehicle_code());
         task.setVehicle_qty(schBasePoint.getVehicle_qty());
-        task.setTask_status(TaskStatus.APPLY.getCode());
+//        task.setTask_status(TaskStatus.APPLY.getCode());
         task.setWorkshop_code(taskConfig.getWorkshop_code()); // 车间编码
         //首位01或06生成任务需要补01，例如GHS0101下发需要改成GHS010101
         task.setPoint_code1(apply_point_code);
         task.setPoint_code2(endPoint);
         task.setTask_status(TaskStatus.CREATED.getCode());
         task.setRemark("");
+        if("GHS1".equals(schBasePoint.getRegion_code())) {
+            task.setTask_type("6");
+        }else{
+            task.setTask_type("10");
+        }
         // 设置起/终点
 //        this.setTaskPoint(taskConfig, task, apply_point_code);
         taskService.create(task);