From 6b05845e3c0e9e72028fff4048a6e0d9727d74d9 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 6 Apr 2023 10:34:26 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 1 + .../nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java | 6 ++---- .../nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java | 4 ++-- .../org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java | 5 ++--- .../wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java | 5 ++--- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 7774240a..d4f129f3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -76,6 +76,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ wrapSendEmptyTask.createTask(param); break; default: + throw new BadRequestException("任务请求类型错误！"); } }catch (Exception ex){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java index a74d34c0..012c611d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java @@ -15,7 +15,6 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -62,7 +61,6 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { pointObj.put("material_id", ""); pointObj.put("update_time", DateUtil.now()); pointTab.update(pointObj); - // todo: 是否需要记录库存 } // 2任务完成 taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); @@ -105,8 +103,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { } // 判断当前点是否有未完成的任务 JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + end_point_code + "' " + - "and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' " + - "and task_status <> '" + TaskStatusEnum.CANCEL.getCode() + "'").uniqueResult(0); + "and task_status <> '" + StatusEnum.TASK_FINISH.getCode() + "' " + + "and task_status <> '" + StatusEnum.TASK_CANNEL.getCode() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { throw new BadRequestException("当前点位" + end_point_code + "存在未完成的任务"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java index 67f00f7f..56d0be4a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java @@ -37,8 +37,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); JSONObject taskObj = taskTab.query("task_id = '" + task.getString("task_id") + "' " + - "AND task_status <> '" + StatusEnum.TASK_FINISH.getCode() + "' " + - "AND task_status <> '" + StatusEnum.TASK_CANNEL.getCode() + "'").uniqueResult(0); + "and task_status <> '" + StatusEnum.TASK_FINISH.getCode() + "' " + + "and task_status <> '" + StatusEnum.TASK_CANNEL.getCode() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("任务已完成，不可取消!"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java index 4785a24f..a5dfb6ed 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java @@ -15,7 +15,6 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -99,8 +98,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask { } // 判断当前点是否有未完成的任务 JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + start_point_code + "' " + - "and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' " + - "and task_status <> '" + TaskStatusEnum.CANCEL.getCode() + "'").uniqueResult(0); + "and task_status <> '" + StatusEnum.TASK_FINISH.getCode() + "' " + + "and task_status <> '" + StatusEnum.TASK_CANNEL.getCode() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { throw new BadRequestException("当前点位" + start_point_code + "存在未完成的任务"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java index 1d31f3e5..dd1d5843 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java @@ -15,7 +15,6 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -102,8 +101,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { } // 判断当前点是否有未完成的任务 JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + start_point_code + "' " + - "and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' " + - "and task_status <> '" + TaskStatusEnum.CANCEL.getCode() + "'").uniqueResult(0); + "and task_status <> '" + StatusEnum.TASK_FINISH.getCode() + "' " + + "and task_status <> '" + StatusEnum.TASK_CANNEL.getCode() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { throw new BadRequestException("当前点位" + start_point_code + "存在未完成的任务"); }