From d76e49df4314ae1442f592fbf27e0bcbd9506944 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 26 六月 2025 10:43:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 8 +++++++-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 29f9c40..739d6cc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -211,11 +211,17 @@
@RequestParam String taskNo,
HttpServletRequest request) {
auth(appkey, taskNo, request);
+ List<TaskWrk> taskWrks = new ArrayList<>();
+ if (Cools.isEmpty(taskNo)) {
+ taskWrks = taskWrkService.selectList(new EntityWrapper<>());
+ return R.ok().add(taskWrks);
+ }
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
if (taskWrk == null) {
return R.error("浠诲姟涓嶅瓨鍦�");
}
- return R.ok().add(taskWrk);
+ taskWrks.add(taskWrk);
+ return R.ok().add(taskWrks);
}
//鏌ヨ浠诲姟鎸囦护闆嗗悎
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 84925f2..0a1d090 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -316,6 +316,12 @@
}
StaProtocol staProtocol = station.get(barcodeSite2.get(i));
if (staProtocol != null) {
+ while (iterator.hasNext()) {
+ String next = iterator.next();
+ if (next.length() < 7 || next.length() > 10) {
+ iterator.remove();
+ }
+ }
staProtocol.setMatIdList(barcodeList);
}
}
@@ -546,7 +552,7 @@
writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
- log.info("鍐欏叆楂樺害鍦板潃锛歿},{}", heightAddress, writeResult3);
+ log.info("鍐欏叆楂樺害鍦板潃锛歿},{}", heightAddress, writeResult3);
if (!writeResult3.IsSuccess) {
//fangzhi xierukushibai,jiu duoxiejici,meixunhuan
writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
--
Gitblit v1.9.1