From 61dff9a8f72744ff6b318da62579030a0132aa3b Mon Sep 17 00:00:00 2001 From: psh Date: Thu, 11 Jan 2024 14:39:45 +0800 Subject: [PATCH] =?UTF-8?q?type=3D4::=E4=B8=80=E8=BD=A6=E9=97=B4=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E5=8C=BA=E5=88=B0=E6=B6=82=E6=9D=BF=E7=BA=BF=20TBXBKJ?= =?UTF-8?q?=20type=3D7:=E4=BA=8C=E8=BD=A6=E9=97=B4=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=8C=BA=E5=88=B0=E6=B6=82=E6=9D=BF=E7=BA=BF=20=20TBXBKJ=20typ?= =?UTF-8?q?e=3D3:=E4=B8=80=E8=BD=A6=E9=97=B4=E7=BC=93=E5=AD=98=E5=8C=BA?= =?UTF-8?q?=E5=88=B0=E5=8C=85=E7=89=87=E6=9C=BA=20BPSL=20type=3D8:?= =?UTF-8?q?=E4=BA=8C=E8=BD=A6=E9=97=B4=E7=BC=93=E5=AD=98=E5=8C=BA=E5=88=B0?= =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=87=BA=E5=BA=93=E4=BD=8D=20ZJBSL=20type=3D?= =?UTF-8?q?5:=20=E4=B8=80=E8=BD=A6=E9=97=B4=E6=B6=82=E6=9D=BF=E7=BA=BF?= =?UTF-8?q?=E5=88=B0=E5=9B=BA=E5=8C=96=E5=AE=A4=20=20=20=20MJXL=20type=3D6?= =?UTF-8?q?:=E4=B8=80=E8=BD=A6=E9=97=B4=E5=9B=BA=E5=8C=96=E5=AE=A4?= =?UTF-8?q?=E5=88=B0=E7=BC=93=E5=AD=98=E5=8C=BA=20=20GHSQH=20type=3D9:=20?= =?UTF-8?q?=E4=BA=8C=E8=BD=A6=E9=97=B4=E6=B6=82=E6=9D=BF=E7=BA=BF=E5=88=B0?= =?UTF-8?q?=E5=9B=BA=E5=8C=96=E5=AE=A4=20=20MJXL=20type=3D10:=20=E4=BA=8C?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=9B=BA=E5=8C=96=E5=AE=A4=E5=88=B0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E5=8C=BA=20=20GHSQH=20type=3D11:=20=E4=B8=80=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E5=8C=85=E7=89=87=E6=9C=BA=E5=88=B0=E5=A0=86=E5=8F=A0?= =?UTF-8?q?=E4=BD=8D=20=20KGHJRK=20type=3D12=EF=BC=9A=E4=B8=80=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E5=8C=85=E7=89=87=E6=9C=BA=E5=88=B0=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=8C=BA=20=20KGHJRK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/sch/task/service/dao/SchBaseTask.java | 4 ++++ .../main/java/org/nl/wms/sch/task_manage/AbstractTask.java | 4 ++-- .../org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java | 1 + .../org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java | 5 +++++ .../org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java | 4 ++++ .../org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java | 5 +++++ .../nl/wms/sch/task_manage/task/tasks/ghs/GHSFMTask.java | 1 + .../nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java | 7 ++++++- 8 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java index 3b33d43..25c8b13 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java +++ b/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; + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index acdfa5a..e91e5f0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/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() .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; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java index c7ad69d..9738d9d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java +++ b/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(""); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java index 46467eb..85297cb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java +++ b/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(""); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java index 7885a13..3eacb4c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java +++ b/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()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java index 5168a64..9bbe948 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java +++ b/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(""); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSFMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSFMTask.java index a82d629..8cb1287 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSFMTask.java +++ b/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(""); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java index 563e159..726a4e8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java +++ b/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);