From 823d35f2b74462246693faeea3297551d1def8e0 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 30 Jul 2025 13:31:40 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E4=BA=8C=E6=9C=9F=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/impl/XianGongAgvServiceImpl.java | 96 ++---------- .../src/main/java/org/nl/acs/device.xls | Bin 178176 -> 178176 bytes .../device/service/dto/StorageCellDto.java | 10 ++ .../service/impl/InstructionServiceImpl.java | 17 +-- .../task/service/impl/TaskServiceImpl.java | 18 +-- .../common/utils/enums/RegionEnum.java | 140 +++--------------- .../modules/quartz/task/AutoCreateInst.java | 51 +++---- 7 files changed, 67 insertions(+), 265 deletions(-) diff --git a/acs3/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs3/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index 448bb19..bc88890 100644 --- a/acs3/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs3/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -644,11 +644,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { JSONObject block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code() + "INGET"); - if ("CPJSSX,BZXXL".contains(inst.getStart_device_code())) { - block.put("operation", "script"); - } else { - block.put("operation", "ForkHeight"); - } + block.put("operation", "ForkHeight"); block.put("id", inst.getStart_point_code() + "INGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -666,17 +662,8 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { JSONObject block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); - // 判断起点是否是钢平台对接点 - String start_point_code = inst.getStart_point_code(); - if (start_point_code.equals("GPTDJDIN")) { - start_point_code += "1"; - } - block.put("location", start_point_code); + block.put("location", inst.getStart_point_code()); block.put("binTask", "ForkLoad"); - // 判断是否是A生产区，并且后缀是 _2 的货位 - if (start_point_code.contains("A") && start_point_code.endsWith("_2")) { - block.put("binTask", "ForkLoad1"); - } blocks.add(block); if ("true".equals(device1.getExtraValue().get("ignore_pickup_check"))) { @@ -684,11 +671,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code() + "OUTGET"); - if ("CPJSSX,BZXXL".contains(inst.getStart_device_code())) { - block.put("operation", "script"); - } else { - block.put("operation", "ForkHeight"); - } + block.put("operation", "ForkHeight"); block.put("id", inst.getStart_point_code() + "OUTGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -703,13 +686,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block.put("script_args", scriptArgs); blocks.add(block); } else { - if (inst.getStart_point_code().equals("GPTDJDIN") || inst.getStart_point_code().equals("GPTDJDOUT")) { - JSONObject block1 = new JSONObject(); - block1.put("blockId", IdUtil.simpleUUID()); - block1.put("binTask", "ForkHeight"); - block1.put("location", start_point_code + "OUTGET"); - blocks.add(block1); - } if (device1.getDeviceDriver() instanceof StandardStorageDeviceDriver) { block = new JSONObject(); block.put("binTask", "ForkHeight"); @@ -726,11 +702,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code() + "INPUT"); - if ("CPJSSX,BZXXL".contains(inst.getNext_device_code())) { - block.put("operation", "script"); - } else { - block.put("operation", "ForkHeight"); - } + block.put("operation", "ForkHeight"); block.put("id", inst.getNext_point_code() + "INPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -748,26 +720,8 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); - // 判断终点是不是钢平台对接点 - String next_point_code = inst.getNext_point_code(); - if (next_point_code.equals("GPTDJDOUT")) { - next_point_code += "1"; - } - block.put("location", next_point_code); + block.put("location", inst.getNext_point_code()); block.put("binTask", "ForkUnload"); - - TaskDto task = taskService.findByCode(inst.getTask_code()); - if ("CPJSSX,BZXXL".contains(inst.getNext_device_code()) && task.getIs_vehicle().equals("0")) { - block.put("binTask", "ForkUnload1"); - } - // 判断是否是A生产区，并且后缀是 _2 的货位(起点是钢平台的则不用带1) - if (next_point_code.contains("A") && next_point_code.endsWith("_2")) { - if (start_point_code.equals("GPTDJDOUT")) { - block.put("binTask", "ForkUnload"); - } else { - block.put("binTask", "ForkUnload1"); - } - } blocks.add(block); if ("true".equals(device2.getExtraValue().get("ignore_release_check"))) { @@ -775,11 +729,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code() + "OUTPUT"); - if ("CPJSSX,BZXXL".contains(inst.getNext_device_code())) { - block.put("operation", "script"); - } else { - block.put("operation", "ForkHeight"); - } + block.put("operation", "ForkHeight"); block.put("id", inst.getNext_point_code() + "OUTPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -794,13 +744,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block.put("script_args", scriptArgs); blocks.add(block); } else { - if (inst.getNext_point_code().equals("GPTDJDIN") || inst.getNext_point_code().equals("GPTDJDOUT")) { - JSONObject block1 = new JSONObject(); - block1.put("blockId", IdUtil.simpleUUID()); - block1.put("binTask", "ForkHeight"); - block1.put("location", next_point_code + "OUTPUT"); - blocks.add(block1); - } if (device2.getDeviceDriver() instanceof StandardStorageDeviceDriver) { block = new JSONObject(); block.put("binTask", "ForkHeight"); @@ -818,11 +761,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code2() + "INGET"); - if ("CPJSSX,BZXXL".contains(inst.getStart_device_code2())) { - block.put("operation", "script"); - } else { - block.put("operation", "ForkHeight"); - } + block.put("operation", "ForkHeight"); block.put("id", inst.getStart_point_code2() + "INGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -842,9 +781,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code2()); block.put("binTask", "ForkLoad"); -// block.put("operationArgs", new JSONObject() {{ -// put("recognize", true); -// }}); blocks.add(block); if ("true".equals(device3.getExtraValue().get("ignore_pickup_check"))) { @@ -852,11 +788,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code2() + "OUTGET"); - if ("CPJSSX,BZXXL".contains(inst.getStart_device_code2())) { - block.put("operation", "script"); - } else { - block.put("operation", "ForkHeight"); - } + block.put("operation", "ForkHeight"); block.put("id", inst.getStart_point_code2() + "OUTGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -889,11 +821,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code2() + "INPUT"); - if ("CPJSSX,BZXXL".contains(inst.getNext_device_code2())) { - block.put("operation", "script"); - } else { - block.put("operation", "ForkHeight"); - } + block.put("operation", "ForkHeight"); block.put("id", inst.getNext_point_code2() + "INPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -920,11 +848,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code2() + "OUTPUT"); - if ("CPJSSX,BZXXL".contains(inst.getNext_device_code2())) { - block.put("operation", "script"); - } else { - block.put("operation", "ForkHeight"); - } + block.put("operation", "ForkHeight"); block.put("id", inst.getNext_point_code2() + "OUTPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); diff --git a/acs3/nladmin-system/src/main/java/org/nl/acs/device.xls b/acs3/nladmin-system/src/main/java/org/nl/acs/device.xls index 0d9ac0a402f532b9ed310098bd636de043801f38..06d4946bbdf13f411016b58c48f5e55d8aa44f28 100644 GIT binary patch delta 8412 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 delta 8248 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 diff --git a/acs3/nladmin-system/src/main/java/org/nl/acs/device/service/dto/StorageCellDto.java b/acs3/nladmin-system/src/main/java/org/nl/acs/device/service/dto/StorageCellDto.java index 0ce97e4..0109f8e 100644 --- a/acs3/nladmin-system/src/main/java/org/nl/acs/device/service/dto/StorageCellDto.java +++ b/acs3/nladmin-system/src/main/java/org/nl/acs/device/service/dto/StorageCellDto.java @@ -81,4 +81,14 @@ public class StorageCellDto implements Serializable { * 修改时间 */ private String update_time; + + /** + * 区域 + */ + private String region_code; + + /** + * 关联货位 + */ + private String contact; } diff --git a/acs3/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs3/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 186b386..052b31a 100644 --- a/acs3/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs3/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -545,22 +545,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu if (ObjectUtil.isEmpty(regionEnumList)) { throw new BadRequestException("任务 [" + instdto.getTask_code() + "] 起点或终点没有找到对应AGV类型无法生成指令。"); } - // 判断是否是AB生产区到地面货架 - if (regionEnumList.size() > 1) { - // 如果是终点是13排的则是PS30车辆 - if (nextJson.getString("x").equals("13")) { - instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type()); - } else { - // 判断终点是否是1层的 - if (nextJson.getString("z").equals("01")) { - instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type()); - } else { - instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type()); - } - } - } else { - instdto.setMaterial(regionEnumList.get(0).getAgv_type()); - } + instdto.setMaterial(regionEnumList.get(0).getAgv_type()); this.create(instdto); } diff --git a/acs3/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs3/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 13544ad..719f3b4 100644 --- a/acs3/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs3/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -459,22 +459,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { throw new BadRequestException("任务 [" + taskcode + "] 起点或终点没有找到对应AGV类型无法生成指令。"); } - // 判断是否是AB生产区到地面货架 - if (regionEnumList.size() > 1) { - // 如果是终点是13排的则是PS30车辆 - if (nextJson.getString("x").equals("13")) { - instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type()); - } else { - // 判断终点是否是1层的 - if (nextJson.getString("z").equals("01")) { - instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type()); - } else { - instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type()); - } - } - } else { - instdto.setMaterial(regionEnumList.get(0).getAgv_type()); - } + instdto.setMaterial(regionEnumList.get(0).getAgv_type()); + try { instructionService.create(instdto); } catch (Exception e) { diff --git a/acs3/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RegionEnum.java b/acs3/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RegionEnum.java index ccd9e15..b25d19f 100644 --- a/acs3/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RegionEnum.java +++ b/acs3/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RegionEnum.java @@ -32,137 +32,33 @@ import java.util.List; @AllArgsConstructor public enum RegionEnum { - // AB生产区-->C生产区 - AB_C("AB", "C","PS20","Group-001"), + // A区到E区 + A_E("A", "E","PS15","Group-005"), - // AB生产区到-->地面面货架 - AB_DMHJ("AB", "DMHJ","PS20","Group-001"), + // E区到G区 + E_G("E", "G","PS15","Group-005"), - // C生产区-->D生产区 - C_D("C", "D","PS20","Group-001"), + // B区到D区 + B_D("B", "D","PS15","Group-005"), - // C生产区-->地面货架 - C_DMHJ("C", "DMHJ","PS20","Group-001"), + // B区到C区 + B_C("B", "C","PS15","Group-005"), - // 地面货架-->C生产区 - DMHJ_C("DMHJ", "C","PS20","Group-001"), + // C区到C区 + C_C("C", "C","PS15","Group-005"), - // D生产区-->地面货架 - D_DMHJ("D", "DMHJ","PS20","Group-001"), + // F区到B区 + F_B("F", "B","PS15","Group-005"), - // 地面货架-->拆盘机 - DMHJ_CPJ("DMHJ", "CPJ","PS20","Group-001"), + // F区到H区 + F_H("F", "H","PS15","Group-005"), - // AB生产区-->地面货架一层 - AB_DMHJ_ONE("AB", "DMHJ","PS30","Group-002"), + // F区到G区 + F_G("F", "G","PS15","Group-005"), - // 地面货架-->AB生产区 - DMHJ_AB("DMHJ", "AB","PS30","Group-002"), + // G区到F区 + G_F("G", "F","PS15","Group-005"), - // AB生产区-->钢平台接驳 - AB_GPTJB("AB", "GPTJB","PS20","Group-001"), - - // 钢平台接驳-->钢平台货架 - GPTJB_GPTHJ("GPTJB", "GPTHJ","PS10","Group-003"), - - // 钢平台货架-->钢平台接驳 - GPTHJ_GPTJB("GPTHJ", "GPTJB","PS10","Group-003"), - - // 钢平台接驳-->AB生产区 - GPTJB_AB("GPTJB", "AB","PS20","Group-001"), - - // 钢平台接驳-->拆盘机 - GPTJB_CPJ("GPTJB", "CPJ","PS20","Group-001"), - - // 包装线-->拆盘机 - BZX_CPJ("BZX", "CPJ","PS15","Group-004"), - - // 拆盘机-->良品区 - CPJ_LPQ("CPJ", "LPQ","PS20","Group-001"), - - // 良品区-->拆盘机 - LPQ_CPJ("LPQ", "CPJ","PS20","Group-001"), - - // AB生产区-->良品区 - AB_LPQ("AB", "LPQ","PS20","Group-001"), - - // 良品区-->AB生产区 - LPQ_AB("LPQ", "AB","PS20","Group-001"), - - // C生产区-->良品区 - C_LPQ("C", "LPQ","PS20","Group-001"), - - // 良品区-->C生产区 - LPQ_C("LPQ", "C","PS20","Group-001"), - - // D生产区-->良品区 - D_LPQ("D", "LPQ","PS20","Group-001"), - - // 良品区-->D生产区 - LPQ_D("LPQ", "D","PS20","Group-001"), - - // 包装线-->良品区 - BZX_LPQ("BZX", "LPQ","PS20","Group-001"), - - // 良品区-->包装线 - LPQ_BZX("LPQ", "BZX","PS20","Group-001"), - - // 地面货架-->良品区 - DMHJ_LPQ("DMHJ", "LPQ","PS20","Group-001"), - - // 良品区-->地面货架 - LPQ_DMHJ("LPQ", "DMHJ","PS20","Group-001"), - - // 钢平台接驳-->良品区 - GPTJB_LPQ("GPTJB", "LPQ","PS20","Group-001"), - - // 良品区-->钢平台接驳 - LPQ_GPTJB("LPQ", "GPTJB","PS20","Group-001"), - - // AB生产区-->AB生产区 - AB_AB("AB", "AB","PS20","Group-001"), - - // C生产区-->C生产区 - C_C("C", "C","PS20","Group-001"), - - // D生产区-->D生产区 - D_D("D", "D","PS20","Group-001"), - - // 良品区-->良品区 - LPQ_LPQ("LPQ", "LPQ","PS20","Group-001"), - - // 地面货架-->地面货架 - DMHJ_DMHJ("DMHJ", "DMHJ","PS20","Group-001"), - - // 钢平台货架-->钢平台货架 - GPTHJ_GPTHJ("GPTHJ", "GPTHJ","PS10","Group-003"), - - // 拆盘机输送线-->空托盘 - CPJ_KPT("CPJ", "KTP","PS15","Group-004"), - - // AB生产区-->拆盘机输送线 - AB_CPJ("AB", "CPJ","PS20","Group-001"), - - // 拆盘机输送线--> 空托盘拆盘机 - CPJ_KTPCPJ("CPJ", "KTPCPJ","PS15","Group-004"), - - // 空托盘缓存--> 空托盘拆盘机 - KTP_KTPCPJ("KTP", "KTPCPJ","PS15","Group-004"), - - // 包装线--> 满托缓存位 - BZX_MTHC("BZX", "MTHC","PS15","Group-004"), - - // 满托缓存--> 拆盘机输送线 - MTHC_CPJ("MTHC", "CPJ","PS15","Group-004"), - - // 拆盘机输送线--> 玻璃纤维区域 - CPJ_BLXW("CPJ", "BLXW","PS15","Group-004"), - - // 拆盘机输送线--> 环氧树脂区域 - CPJ_HYSZ("CPJ", "HYSZ","PS15","Group-004"), - - // 拆盘机输送线--> 固化剂区域 - CPJ_GHJ("CPJ", "GHJ","PS15","Group-004"), ; // 起点区域 diff --git a/acs3/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/acs3/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java index cf80665..4431f73 100644 --- a/acs3/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java +++ b/acs3/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java @@ -8,6 +8,8 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.nl.acs.config.AcsConfig; +import org.nl.acs.device.service.StorageCellService; +import org.nl.acs.device.service.dto.StorageCellDto; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.opc.Device; @@ -46,30 +48,44 @@ public class AutoCreateInst { ParamService acsConfigService = SpringContextHolder.getBean(ParamService.class); // 设备接口 DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); + // 货位接口 + StorageCellService storageCellService = SpringContextHolder.getBean(StorageCellService.class); // 查询所有就绪的任务 List list = taskserver.findReadyTask(); for (int i = 0; i < list.size(); i++) { TaskDto acsTask = list.get(i); - // 起点或者是终点是钢平台货架的 只能同时支持一个入一个出 - String startPoint = acsTask.getStart_device_code(); - String nextPoint = acsTask.getNext_device_code(); - if (startPoint.startsWith("L")) { + // 如果有深浅的货位需要判断对应关联货位，只允许一个任务执行 + List storageCellDtos = storageCellService.queryAll(null); + StorageCellDto startPoint = storageCellDtos.stream() + .filter(row -> row.getStorage_code().equals(acsTask.getStart_device_code())) + .findFirst().orElse(null); + + StorageCellDto nextPoint = storageCellDtos.stream() + .filter(row -> row.getStorage_code().equals(acsTask.getNext_device_code())) + .findFirst().orElse(null); + + if (ObjectUtil.isNotEmpty(startPoint.getContact())) { // 查询所有执行中的任务 List readyExTask = taskserver.findReadyExTask(); - // 判断执行中的任务有没有起点是钢平台的 + // 判断执行中的任务 boolean isStart = readyExTask.stream() - .anyMatch(row -> row.getStart_device_code().startsWith("L")); + .anyMatch(row -> startPoint.getContact().contains(row.getStart_device_code()) + || startPoint.getContact().contains(row.getNext_device_code()) + ); if (isStart) { continue; } } - if (nextPoint.startsWith("L")) { + + if (ObjectUtil.isNotEmpty(nextPoint.getContact())) { // 查询所有执行中的任务 List readyExTask = taskserver.findReadyExTask(); - // 判断执行中的任务有没有终点是钢平台的 + // 判断执行中的任务 boolean isEnd = readyExTask.stream() - .anyMatch(row -> row.getNext_device_code().startsWith("L")); + .anyMatch(row -> nextPoint.getContact().contains(row.getStart_device_code()) + || nextPoint.getContact().contains(row.getNext_device_code()) + ); if (isEnd) { continue; } @@ -212,22 +228,7 @@ public class AutoCreateInst { continue; } - // 判断是否是AB生产区到地面货架 - if (regionEnumList.size() > 1) { - // 如果是终点是13排的则是PS30车辆 - if (nextJson.getString("x").equals("13")) { - instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type()); - } else { - // 判断终点是否是1层的 - if (nextJson.getString("z").equals("01")) { - instdto.setMaterial(RegionEnum.AB_DMHJ_ONE.getAgv_type()); - } else { - instdto.setMaterial(RegionEnum.AB_DMHJ.getAgv_type()); - } - } - } else { - instdto.setMaterial(regionEnumList.get(0).getAgv_type()); - } + instdto.setMaterial(regionEnumList.get(0).getAgv_type()); try { instructionService.create(instdto);