From 88c3d7ae13d3232584529d43aa0f35a176c1d271 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Wed, 25 Feb 2026 10:22:12 +0800
Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=E5=A5=97=E4=BB=B6=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/StorageCellServiceImpl.java | 4 +
.../StandardInspectSiteDeviceDriver.java | 114 ++++++++++++++++++
.../StandardOrdinarySiteDeviceDriver.java | 4 +-
.../wms/service/impl/AcsToNDCServiceImpl.java | 2 +-
.../views/acs/device/storageCell/index.vue | 16 +++
5 files changed, 137 insertions(+), 3 deletions(-)
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
index 496863b..0d3ba7a 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
@@ -53,6 +53,7 @@ public class StorageCellServiceImpl implements StorageCellService , ApplicationA
String storage_code = MapUtil.getStr(whereJson, "storage_code");
String parent_storage_code = MapUtil.getStr(whereJson, "parent_storage_code");
String address = MapUtil.getStr(whereJson, "address");
+ String address1 = MapUtil.getStr(whereJson, "address1");
String where = "";
if (StrUtil.isNotEmpty(storage_code)) {
where += " and storage_code like '%" + storage_code + "%'";
@@ -63,6 +64,9 @@ public class StorageCellServiceImpl implements StorageCellService , ApplicationA
if (StrUtil.isNotEmpty(address)) {
where += " and address like '%" + address + "%'";
}
+ if (StrUtil.isNotEmpty(address1)) {
+ where += " and address1 like '%" + address1 + "%'";
+ }
WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1 = 1 " + where, "update_time desc");
final JSONObject json = rb.pageResult();
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 dd3bade..5b8c688 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
@@ -13,6 +13,8 @@ import net.dreamlu.mica.core.utils.StringUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
import org.nl.acs.device.service.DeviceService;
+import org.nl.acs.device.service.dto.StorageCellDto;
+import org.nl.acs.device.service.impl.StorageCellServiceImpl;
import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.RouteableDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
@@ -167,6 +169,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
TaskDto task = taskService.findByCode(instruction.getTask_code());
if ((StrUtil.startWith(task.getTask_code(), "-"))) {
log.info("定点任务下发agv允许取货信号");
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress());
+ instruction.setOffSetName(instruction.getStart_point_code());
HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return;
@@ -190,6 +199,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
JSONObject response = JSONObject.parseObject(result.body());
int responseCode = response.getInteger("responseCode");
if (responseCode == 0) {
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress());
+ instruction.setOffSetName(instruction.getStart_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -236,6 +252,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
.build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress());
+ instruction.setOffSetName(instruction.getStart_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -254,6 +277,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
luceneExecuteLogService.deviceExecuteLog(logDto);
}
} else if (ext_system.equals("2")) {
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress());
+ instruction.setOffSetName(instruction.getStart_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -282,6 +312,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if ((StrUtil.startWith(task.getTask_code(), "-"))) {
log.info("定点任务下发agv允许取货信号");
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress());
+ instruction.setOffSetName(instruction.getStart_point_code());
HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return;
@@ -305,6 +342,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
JSONObject response = JSONObject.parseObject(result.body());
int responseCode = response.getInteger("responseCode");
if (responseCode == 0) {
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress());
+ instruction.setOffSetName(instruction.getStart_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -344,6 +388,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
int code = response2.getInteger("code");
if (code == 200) {
log.info("请求焊接线成功，申请取货完成 请求结果{}", code);
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress());
+ instruction.setOffSetName(instruction.getStart_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -369,6 +420,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
JSONObject response = JSONObject.parseObject(result.body());
int responseCode = response.getInteger("responseCode");
if (responseCode == 0) {
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress());
+ instruction.setOffSetName(instruction.getStart_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -391,6 +449,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
TaskDto task = taskService.findByCode(instruction.getTask_code());
if ((StrUtil.startWith(task.getTask_code(), "-"))) {
log.info("定点任务下发agv允许取货信号");
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress1());
+ instruction.setOffSetName(instruction.getNext_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -414,6 +479,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
JSONObject response = JSONObject.parseObject(result.body());
int responseCode = response.getInteger("responseCode");
if (responseCode == 0) {
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress1());
+ instruction.setOffSetName(instruction.getNext_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -442,6 +514,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
int code = response.getInteger("code");
if (code == 200) {
log.info("请求焊接线放货成功，申请取货 请求结果{}", code);
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress1());
+ instruction.setOffSetName(instruction.getNext_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -455,6 +534,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
return;
}
} else if (ext_system.equals("2")) {
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress1());
+ instruction.setOffSetName(instruction.getNext_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -476,6 +562,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
TaskDto task = taskService.findByCode(instruction.getTask_code());
if ((StrUtil.startWith(task.getTask_code(), "-"))) {
log.info("定点任务下发agv允许取货信号");
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress1());
+ instruction.setOffSetName(instruction.getNext_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -499,6 +592,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
JSONObject response = JSONObject.parseObject(result.body());
int responseCode = response.getInteger("responseCode");
if (responseCode == 0) {
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress1());
+ instruction.setOffSetName(instruction.getNext_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -537,6 +637,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
int code = response2.getInteger("code");
if (code == 200) {
log.info("请求焊接线放货货完成成功，请求结果{}", code);
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress1());
+ instruction.setOffSetName(instruction.getNext_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
@@ -564,6 +671,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
JSONObject response = JSONObject.parseObject(result.body());
int responseCode = response.getInteger("responseCode");
if (responseCode == 0) {
+ StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
+ if (dto == null) {
+ log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
+ return;
+ }
+ instruction.setOffSet(dto.getAddress1());
+ instruction.setOffSetName(instruction.getNext_point_code());
HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
index f36c578..62add46 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
@@ -223,7 +223,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
return;
}
- instruction.setOffSet(dto.getAddress());
+ instruction.setOffSet(dto.getAddress1());
instruction.setOffSetName(instruction.getNext_point_code());
device = deviceAppService.findDeviceByCode(this.devicecode);
HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10);
@@ -244,7 +244,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
return;
}
- instruction.setOffSet(dto.getAddress());
+ instruction.setOffSet(dto.getAddress1());
instruction.setOffSetName(instruction.getNext_point_code());
if ((StrUtil.startWith(task.getTask_code(), "-"))) {
log.info("定点任务下发agv允许取货信号");
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java
index 60f91c7..2281b64 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java
@@ -52,7 +52,7 @@ public class AcsToNDCServiceImpl implements AcsToNDCService {
ja.put("taskId", Integer.valueOf(instruction.getInstruction_code()));
DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);
int startAddress = deviceService.queryAddressBydeviceCode(instruction.getStart_point_code());
- int nextAddress = deviceService.queryAddressBydeviceCode(instruction.getNext_point_code());
+ int nextAddress = deviceService.queryAddressBynextdeviceCode(instruction.getNext_point_code());
ja.put("pickId", startAddress);
ja.put("pickName", instruction.getStart_point_code());
ja.put("releaseId", nextAddress);
diff --git a/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue b/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
index da71d7a..e5dc1ed 100644
--- a/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
@@ -12,6 +12,22 @@
style="width: 200px;"
class="filter-item"
/>
+
+