From ab2224663f96ee996dc21d452940f613bd120744 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Thu, 21 May 2026 13:12:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B2=E7=87=A5=E5=8C=BA=E9=80=81?= =?UTF-8?q?=E6=96=99=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=85=88=E7=BA=A7=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA10=EF=BC=8C=E5=8F=96=E6=B6=88=E8=B4=A7?= =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardInspectSiteDeviceDriver.java | 10 +++++----- .../wms/sch/task/send/material/GZSendMaterialTask.java | 3 ++- .../src/main/resources/config/application.yml | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 269c3f4..856006e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -193,8 +193,8 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp break; case 3: //载具解绑 - if(!requireSucess && task != 0){ - System.out.println("触发载具解绑" + task + mode + device_code); + if(!requireSucess){ + log.debug("触发载具解绑：device_code= {}",device_code); this.vehicleUnbind(); } case 5: @@ -317,9 +317,9 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (result.getStatus() == HttpStatus.OK.value()) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) { -// Map map = new LinkedHashMap<>(); -// map.put("to_command",5); - this.writing(this.mode); + Map map = new LinkedHashMap<>(); + map.put("to_command",30); + this.writing(map); this.setRequireSucess(true); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/GZSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/GZSendMaterialTask.java index cf1dbea..ac335de 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/GZSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/GZSendMaterialTask.java @@ -54,7 +54,8 @@ public class GZSendMaterialTask extends AbstractAcsTask { vd.getString("material_id"), vd.getString("vehicle_type"), vd.getString("vehicle_code"), - TrueOrFalse.trueOrFalse(workOrder.getString("is_urgent")) ? 4 : 1, +// TrueOrFalse.trueOrFalse(workOrder.getString("is_urgent")) ? 4 : 1, + 10, GZSendMaterialTask.class.getName(), form.getString("create_mode"), form.getString("request_param"), diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index 6f01423..942ceff 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/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: