From b21062b1c578e1d26b65f474c1566072b0566222 Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Thu, 30 Oct 2025 20:24:36 +0800 Subject: [PATCH] =?UTF-8?q?opt:MES=E6=8E=A5=E5=8F=A3=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext_manage/service/impl/MesToWmsServiceImpl.java | 12 ++++++------ .../sch_manage/service/util/tasks/BackInTask.java | 4 ++-- .../sch_manage/service/util/tasks/VehicleInTask.java | 4 ++-- .../service/util/tasks/zw/DownEmptyUpFullTask.java | 4 ++-- .../service/util/tasks/zw/SeparateMaterialTask.java | 4 ++-- .../org/nl/wms/warehouse_manage/enums/IOSEnum.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java index 05acfc1..e3976e8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java @@ -301,9 +301,9 @@ public class MesToWmsServiceImpl implements MesToWmsService { taskParam.put("task_code", dto.getTask_code()); taskParam.put("ext_task_code", dto.getTask_code()); if (dto.getIsManual() != null && dto.getIsManual()) { - taskParam.put("create_mode", "手动"); + taskParam.put("create_mode", IOSEnum.CREATE_MODE.code("手动")); } else { - taskParam.put("create_mode", "自动"); + taskParam.put("create_mode", IOSEnum.CREATE_MODE.code("外部接口产生")); } outBillService.allSetPoint(taskParam); return MesResponse.requestOk(); @@ -427,9 +427,9 @@ public class MesToWmsServiceImpl implements MesToWmsService { taskParam.put("task_code", dto.getTask_code()); taskParam.put("ext_task_code", dto.getTask_code()); if (dto.getIsManual() != null && dto.getIsManual()) { - taskParam.put("create_mode", "手动"); + taskParam.put("create_mode", IOSEnum.CREATE_MODE.code("手动")); } else { - taskParam.put("create_mode", "自动"); + taskParam.put("create_mode", IOSEnum.CREATE_MODE.code("外部接口产生")); } outBillService.allSetPoint(taskParam); return MesResponse.requestOk(); @@ -500,10 +500,10 @@ public class MesToWmsServiceImpl implements MesToWmsService { JSONObject param = new JSONObject(); if (dto.getIsManual() != null && dto.getIsManual()) { - param.put("create_mode", "手动"); + param.put("create_mode", IOSEnum.CREATE_MODE.code("手动")); param.put("is_manual", true); } else { - param.put("create_mode", "自动"); + param.put("create_mode", IOSEnum.CREATE_MODE.code("外部接口产生")); } //退料 param.put("ext_task_code", dto.getTask_code()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java index 1678b70..a3fcda1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java @@ -187,7 +187,7 @@ public class BackInTask extends AbstractTask { taskService.updateById(taskObj); //如果是自动的，回调MES接口，将task_code传给mes - if ("自动".equals(taskObj.getCreate_mode())) { + if (IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())) { JSONObject jsonObject = new JSONObject(); jsonObject.put("status", 200); jsonObject.put("message", "成功"); @@ -215,7 +215,7 @@ public class BackInTask extends AbstractTask { taskService.updateById(taskObj); //反馈到MES系统 - if ("自动".equals(taskObj.getCreate_mode())) { + if (IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())) { JSONObject jsonObject = new JSONObject(); jsonObject.put("status", 400); jsonObject.put("message", "任务被取消"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java index b28cfdf..220c8df 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java @@ -195,7 +195,7 @@ public class VehicleInTask extends AbstractTask { taskService.updateById(taskObj); //如果是自动的，回调MES接口，将task_code传给mes - if("自动".equals(taskObj.getCreate_mode())){ + if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){ JSONObject jsonObject=new JSONObject(); jsonObject.put("status",200); jsonObject.put("message","成功"); @@ -228,7 +228,7 @@ public class VehicleInTask extends AbstractTask { iStructattrService.updateStatusByCode("2",unlock_map); //反馈到MES系统 - if("自动".equals(taskObj.getCreate_mode())){ + if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){ JSONObject jsonObject=new JSONObject(); jsonObject.put("status",400); jsonObject.put("message","任务被取消"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java index fd443b8..f0610ac 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java @@ -269,7 +269,7 @@ public class DownEmptyUpFullTask extends AbstractTask { // iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id())); //反馈到MES系统 - if("自动".equals(taskObj.getCreate_mode())){ + if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){ JSONObject jsonObject=new JSONObject(); jsonObject.put("status",200); jsonObject.put("message","成功"); @@ -342,7 +342,7 @@ public class DownEmptyUpFullTask extends AbstractTask { taskService.updateById(taskObj); //反馈到MES系统 - if("自动".equals(taskObj.getCreate_mode())){ + if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){ JSONObject jsonObject=new JSONObject(); jsonObject.put("status",400); jsonObject.put("message","任务被取消"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java index a670c2e..6fa7903 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java @@ -195,7 +195,7 @@ public class SeparateMaterialTask extends AbstractTask { // iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id())); //反馈到MES系统 - if("自动".equals(taskObj.getCreate_mode())){ + if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){ JSONObject jsonObject=new JSONObject(); jsonObject.put("status",200); jsonObject.put("message","成功"); @@ -268,7 +268,7 @@ public class SeparateMaterialTask extends AbstractTask { taskService.updateById(taskObj); //反馈到MES系统 - if("自动".equals(taskObj.getCreate_mode())){ + if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){ JSONObject jsonObject=new JSONObject(); jsonObject.put("status",400); jsonObject.put("message","任务被取消"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java index bc475e4..5b29339 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java @@ -45,7 +45,7 @@ public enum IOSEnum { POINT_STATUS(MapOf.of("无货", "1", "空载具", "2" , "有货", "3" )), // 单据创建类型 - CREATE_MODE(MapOf.of("PC产生", "1", "终端产生", "2", "外部接口产生", "3")), + CREATE_MODE(MapOf.of("PC产生", "1", "终端产生", "2", "外部接口产生", "3", "手动", "4")), // 移库单状态 MOVE_MST_STATUS(MapOf.of("生成", "10", "提交", "20", "执行中", "30", "完成", "99")),