From d4a63d161950bcb736b4c9820aa2efad26cf19b1 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 18 Apr 2023 12:00:00 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E7=BC=93=E5=AD=98=E7=BA=BF=E6=9C=89?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E4=B8=8D=E4=B8=8B=E5=8F=91=E8=B0=83?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InstructionServiceImpl.java | 11 +++++++---- .../system/service/impl/ParamServiceImpl.java | 1 - .../src/views/system/monitor/device/index.vue | 18 +++++++++--------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index c23e0658..21c75959 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -1327,7 +1327,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu if (putDevice != null) { if (startDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) startDevice.getDeviceDriver(); - if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { + if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { + throw new BadRequestException("缓存线已存在任务,稍后下发!"); + } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { //下发电气单出 to_task_type = "4"; } @@ -1340,11 +1342,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } if (putDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) putDevice.getDeviceDriver(); - if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { + if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { + throw new BadRequestException("缓存线已存在任务,稍后下发!"); + } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { //下发电气单入 to_task_type = "2"; - } - if (tasksByLinNum.size() == 2 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { + } else if (tasksByLinNum.size() == 2 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { //下发电气双入 to_task_type = "3"; } diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java index 47dc5a9f..3f1a1387 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java @@ -73,7 +73,6 @@ public class ParamServiceImpl implements ParamService { return null; } final ParamDto obj = json.toJavaObject(ParamDto.class); - ; return obj; } diff --git a/wcs/nladmin-ui/src/views/system/monitor/device/index.vue b/wcs/nladmin-ui/src/views/system/monitor/device/index.vue index 5bf41e35..0795709e 100644 --- a/wcs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/wcs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -1,7 +1,7 @@