From e552993803b2440c6b962c0e848c8cb3c2ccf6e8 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 26 Apr 2023 13:45:08 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E6=A0=A1=E9=AA=8C=E3=80=81=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/auto/run/OneNDCSocketConnectionAutoRun.java | 6 +++--- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 9 +++------ .../ext/wms/service/impl/WmsToAcsServiceImpl.java | 13 ++++++++++--- .../src/main/resources/config/application.yml | 2 +- .../resources/log/OneNDCSocketConnectionAutoRun.xml | 2 +- .../src/main/resources/logback-spring.xml | 6 +++--- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index e1fa800..d758f97 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -131,9 +131,9 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } if (ikey != 0) { inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); - if (ObjectUtil.isEmpty(inst)) { - inst = instructionService.findByCode(String.valueOf(ikey)); - } +// if (ObjectUtil.isEmpty(inst)) { +// inst = instructionService.findByCode(String.valueOf(ikey)); +// } } if (!ObjectUtil.isEmpty(link_inst)) { link_flag = true; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index f7249b7..f8c6688 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -32,10 +32,7 @@ import org.nl.modules.system.service.ParamService; import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.wql.util.SpringContextHolder; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * NDC单工位AGV @@ -96,9 +93,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } if (ikey != 0) { inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); - if (ObjectUtil.isEmpty(inst)) { - inst = instructionService.findByCode(String.valueOf(ikey)); - } +// if (ObjectUtil.isEmpty(inst)) { +// inst = instructionService.findByCode(String.valueOf(ikey)); +// } } if (!ObjectUtil.isEmpty(link_inst)) { link_flag = true; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index ecc9b90..c768828 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -475,21 +475,28 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (StrUtil.isEmpty(task_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); - json.put("message", "任务号不能为空"); + json.put("message", "任务号不能为空！"); + errArr.add(json); + continue; + } + if (StrUtil.isEmpty(vehicle_code)) { + JSONObject json = new JSONObject(); + json.put("task_code", task_code); + json.put("message", "托盘号不能为空！"); errArr.add(json); continue; } if (StrUtil.isEmpty(start_device_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); - json.put("message", "起点不能为空"); + json.put("message", "起点不能为空！"); errArr.add(json); continue; } if (StrUtil.isEmpty(next_device_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); - json.put("message", "终点不能为空"); + json.put("message", "终点不能为空！"); errArr.add(json); continue; } diff --git a/acs/nladmin-system/src/main/resources/config/application.yml b/acs/nladmin-system/src/main/resources/config/application.yml index f943602..cfc52fe 100644 --- a/acs/nladmin-system/src/main/resources/config/application.yml +++ b/acs/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml index 7387ef7..ab39d63 100644 --- a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml +++ b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml @@ -6,7 +6,7 @@ - ${LOG_HOME}/一楼NDC系统/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/NDC系统/%d{yyyy-MM-dd}.%i.log 15 diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index 15d2500..9ebaaf0 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -34,11 +34,11 @@ https://juejin.cn/post/6844903775631572999 - - + + - +