From 86ec073ab2ef3e35c2cc8e91ec2747231eae2578 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期五, 16 一月 2026 11:33:31 +0800
Subject: [PATCH] 非自动不发送回退指令
---
src/main/java/com/rfid/uhf288/Device.java | 6 +++---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/rfid/uhf288/Device.java b/src/main/java/com/rfid/uhf288/Device.java
index 531c944..ee221d2 100644
--- a/src/main/java/com/rfid/uhf288/Device.java
+++ b/src/main/java/com/rfid/uhf288/Device.java
@@ -48,9 +48,9 @@
// 鏂规硶1: 浣跨敤缁濆璺緞鐩存帴鍔犺浇DLL
try {
// 浣跨敤鐪熷疄璺緞鍔犺浇DLL
- String projectBaseDir = "D:\\work\\work-zy\\zy-wcs";
- String mainDllPath = projectBaseDir + "\\src\\main\\resources\\lib\\" + mainDllName;
- String depDllPath = projectBaseDir + "\\src\\main\\resources\\lib\\" + depDllName;
+ String projectBaseDir = "D:\\apache-tomcat-8.5.57\\webapps";
+ String mainDllPath = projectBaseDir + "\\wcs\\WEB-INF\\classes\\lib\\" + mainDllName;
+ String depDllPath = projectBaseDir + "\\wcs\\WEB-INF\\classes\\lib\\" + depDllName;
File mainDllFile = new File(mainDllPath);
File depDllFile = new File(depDllPath);
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 5e13bfe..cce1270 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -1115,12 +1115,17 @@
// ledThread.errorReset();
}
} else {
+ String errorMsg = jsonObject.getString("msg");
+ // 濡傛灉浠诲姟鍥為��锛屽苟涓旂珯鐐逛笉鏄嚜鍔ㄧ姸鎬侊紝鍒欎笉瑙﹀彂鍥為��
+ if (!staProtocol.isAutoing()) {
+ log.error("绌烘澘鍏ュ簱鍥為��"+wrkNo+","+errorMsg+"锛岀珯鐐逛笉鏄嚜鍔ㄧ姸鎬侊紝涓嶈Е鍙戝洖閫�");
+ continue;
+ }
staProtocol.setWorkNo(wrkNo);
wrkNo++;
staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- String errorMsg = jsonObject.getString("msg");
log.error("绌烘澘鍏ュ簱鍥為��"+wrkNo+","+errorMsg);
if (!result) {
News.errorNoLog(""+mark+" - 2"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
--
Gitblit v1.9.1