From 42e3fc1175930e8c1a92fe8c00181aa20de08b6d Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Sat, 21 Dec 2024 22:50:33 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=9B=BA=E5=8C=96?= =?UTF-8?q?=E5=AE=A4=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device_driver/tianneng/site/SiteDeviceDriver.java | 9 ++++----- .../instruction/service/impl/InstructionServiceImpl.java | 2 +- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 3 +-- .../task_manage/task/tasks/auto/mapper/AutoMapper.xml | 4 ++-- .../nl/wms/sch/task_manage/task/tasks/tbx/TBXQKTask.java | 8 ++++---- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java index 4694081..5fbd5c6 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java @@ -289,9 +289,8 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD public void writing(int command) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "." + ItemProtocol.item_to_command; - //String opcservcerid = this.getDevice().getOpc_server_id(); -//Server server = ReadUtil.getServer(opcservcerid); + //Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); itemMap.put(to_command, command); this.control(itemMap); @@ -406,7 +405,7 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD jsonObject.put("requestNo", IdUtil.simpleUUID()); if (type == 5) { if (device_code.startsWith("ZCSSX")) { - log.error("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务"); + //log.error("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务"); jsonObject.put("request_method_code", "KJQKTask"); } } @@ -415,9 +414,9 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD if (StrUtil.equals(res_jo.getString("code"), "200")) { this.writing(type); this.setRequireSucess(true); - log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务成功！"); + //log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务成功！"); } else { - log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务失败！" + res_jo.getString("message")); + //log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务失败！" + res_jo.getString("message")); } return true; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 1d79e6a..b75d925 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -187,7 +187,7 @@ public class InstructionServiceImpl extends CommonServiceImpl queryPage = PageUtil.toMybatisPage(page); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(InstructionMybatis::getIs_delete,0); + // wrapper.eq(InstructionMybatis::getIs_delete,0); wrapper.and(StringUtils.isNotBlank(code), instructionMybatis -> instructionMybatis.like(InstructionMybatis::getInstruction_code, code).or().like(InstructionMybatis::getTask_code, code)); wrapper.like(StringUtils.isNotBlank(vehicle_code), InstructionMybatis::getVehicle_code, vehicle_code); wrapper.eq(StringUtils.isNotBlank(material_type), InstructionMybatis::getMaterial, material_type); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 2e29a4c..c3dfcc0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -118,9 +118,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.setCode(HttpStatus.HTTP_BAD_REQUEST); result.setMessage(message); result.setRequestNo(requestNo); - String title = "acsApply: " + param.getString("request_method_code"); // 消息通知 - noticeService.createNotice("异常信息：" + message, title, NoticeTypeEnum.EXCEPTION.getCode()); + noticeService.createNotice("异常信息：" + message, device_code, NoticeTypeEnum.EXCEPTION.getCode()); } return result; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml index 4ec7a3f..f8b4e2f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml @@ -25,7 +25,7 @@ ORDER BY p.row_num, p.col_num - limit 1 + limit 10