From cf51e231a2546bd3c70171f58da6539bcdadb165 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 6 Apr 2023 09:42:46 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BC=98=E5=8C=96=E5=88=BB=E5=AD=97?= =?UTF-8?q?=E3=80=81=E5=8C=85=E8=A3=85=E4=BB=BB=E5=8A=A1=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java | 6 ++---- .../nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java | 6 ++---- .../org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java | 6 ++---- .../wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) 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 7fc27ca3..a74d34c0 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 @@ -55,9 +55,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { taskTab.update(taskObj); } else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { // 完成 - if (ObjectUtil.isNotEmpty(pointCode1)) { + if (ObjectUtil.isNotEmpty(pointObj)) { // 释放点位并赋值 - pointTab.query("point_code = '" + pointCode1 + "'").uniqueResult(0); pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode()); pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY.getCode()); pointObj.put("material_id", ""); @@ -78,9 +77,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { * 2、任务状态修改 */ // 2点位恢复 - if (ObjectUtil.isNotEmpty(pointCode1)) { + if (ObjectUtil.isNotEmpty(pointObj)) { // 释放点位 - pointTab.query("point_code = '" + pointCode1 + "'").uniqueResult(0); pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode()); pointObj.put("update_time", DateUtil.now()); pointTab.update(pointObj); 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 e67c785e..67f00f7f 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 @@ -55,9 +55,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask { taskTab.update(taskObj); } else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { // 完成 - if (ObjectUtil.isNotEmpty(pointCode1)) { + if (ObjectUtil.isNotEmpty(pointObj)) { // 释放点位并赋值 - pointTab.query("point_code = '" + pointCode1 + "'").uniqueResult(0); pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode()); pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY.getCode()); pointObj.put("material_id", ""); @@ -77,9 +76,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask { * 2、任务状态修改 */ // 2点位恢复 - if (ObjectUtil.isNotEmpty(pointCode1)) { + if (ObjectUtil.isNotEmpty(pointObj)) { // 释放点位 - pointTab.query("point_code = '" + pointCode1 + "'").uniqueResult(0); pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode()); pointObj.put("update_time", DateUtil.now()); pointTab.update(pointObj); 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 315f1f6d..4785a24f 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 @@ -55,9 +55,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask { taskTab.update(taskObj); } else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { // 完成 - if (ObjectUtil.isNotEmpty(pointCode2)) { + if (ObjectUtil.isNotEmpty(pointObj)) { // 释放点位并赋值 - pointTab.query("point_code = '" + pointCode2 + "'").uniqueResult(0); pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode()); pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode()); pointObj.put("update_time", DateUtil.now()); @@ -76,9 +75,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask { * 2、任务状态修改 */ // 2点位恢复 - if (ObjectUtil.isNotEmpty(pointCode2)) { + if (ObjectUtil.isNotEmpty(pointObj)) { // 释放点位 - pointTab.query("point_code = '" + pointCode2 + "'").uniqueResult(0); pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode()); pointObj.put("update_time", DateUtil.now()); pointTab.update(pointObj); 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 067a4492..1d31f3e5 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 @@ -55,9 +55,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { taskTab.update(taskObj); } else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { // 完成 - if (ObjectUtil.isNotEmpty(pointCode2)) { + if (ObjectUtil.isNotEmpty(pointObj)) { // 释放点位并赋值 - pointTab.query("point_code = '" + pointCode2 + "'").uniqueResult(0); pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode()); pointObj.put("point_status", StatusEnum.POINT_STATUS_FULL.getCode()); pointObj.put("material_id", taskObj.getString("material_id")); @@ -78,9 +77,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { * 2、任务状态修改 */ // 2点位恢复 - if (ObjectUtil.isNotEmpty(pointCode2)) { + if (ObjectUtil.isNotEmpty(pointObj)) { // 释放点位 - pointTab.query("point_code = '" + pointCode2 + "'").uniqueResult(0); pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode()); pointObj.put("update_time", DateUtil.now()); pointTab.update(pointObj);