From e2a14112a81740481623dc16bbd1301432ce34b0 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期三, 27 八月 2025 13:15:22 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 7 ++++---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 ++++++++++++++--------
src/main/java/com/zy/core/MainProcess.java | 4 ++--
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4b0d7d3..035451e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -763,17 +763,23 @@
}
List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<TaskWrkLog>().eq("CRN_NO",crnProtocol.getLaneNo()).orderBy("COMPLETE_TIME",false));
if (!taskWrkLogs.isEmpty()) {
- TaskWrkLog taskWrkLog = taskWrkLogs.get(0);
- Date completeTime = taskWrkLog.getCompleteTime();
- if (completeTime==null){
- completeTime = taskWrkLog.getCancelTime();
+ boolean signT = false;
+ for (TaskWrkLog taskWrkLog : taskWrkLogs){
+ Date completeTime = taskWrkLog.getCompleteTime();
if (completeTime==null){
- completeTime = taskWrkLog.getModiTime();
+ continue;
+ }
+ long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(completeTime, new Date());
+ if (differenceInSeconds <= 60*2*1000) {
+ signT = true;
+ break;
+ } else {
+ signT = false;
+ break;
}
}
- long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(completeTime, new Date());
- if (differenceInSeconds <= 60*10*1000) {
- return;
+ if (signT){
+ continue;
}
}
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2ca1f41..6b314b0 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -47,6 +47,8 @@
mainService.storeFinished();
// 浠诲姟涓嬪彂
mainService.taskStart();
+ // 鍑哄簱 ===>> 鍫嗗灈鏈�2鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
+ mainService.crnStnToOutStnSou();
} catch (Exception e) {
e.printStackTrace();
}
@@ -67,8 +69,6 @@
mainService.crnStnToOutStn();
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
- // 鍑哄簱 ===>> 鍫嗗灈鏈�10鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
- mainService.crnStnToOutStnSou();
// 杈撻�佺嚎寮傚父淇℃伅璁板綍
// mainService.recDevErr();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 4a12228..603aa3b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -286,6 +286,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("crnWriteIng", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍫嗗灈鏈哄緟涓嬪彂鎸囦护:"+JSON.toJSONString(command.getNowTask()));
} catch (Exception e){
+ log.error("crnWriteIng鏂板寮傚父");
}
try{
@@ -320,7 +321,7 @@
try{
Thread.sleep(50L);
- } catch (Exception e){}
+ } catch (Exception e){log.error("寤舵椂寮傚父324琛�");}
log.info("鍫嗗灈鏈轰换鍔″啓100.0锛氬�硷細array crnWrite-317琛�;array:"+JSON.toJSONString(array));
OperateResult result = siemensNet.Write("DB100.0", array);
@@ -330,8 +331,8 @@
i++;
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
try{
- Thread.sleep(100L);
- } catch (Exception e){}
+ Thread.sleep(50L);
+ } catch (Exception e){log.error("寤舵椂寮傚父335琛�");}
log.info("鍫嗗灈鏈轰换鍔¤100.0锛氬�硷細20 crnWrite-317琛�;");
OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
--
Gitblit v1.9.1