From dca06cb013a8312dc37feec69a79165e11ffea63 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期五, 18 七月 2025 10:48:58 +0800
Subject: [PATCH] 空闲10秒有入库任务回原点，空闲两分钟回原点
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 6ec2b29..8325cee 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -1193,6 +1193,9 @@
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if(crnProtocol == null) {
+ continue;
+ }
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
// 鍒ゆ柇鏄笉鏄凡鍦ㄥ師鐐�
@@ -1207,8 +1210,13 @@
Date now = new Date();
Date modiTime = basCrnp.getModiTime();
long diffInMillis = now.getTime()-modiTime.getTime();
- if(diffInMillis < 3 * 60 * 1000) {
+ if(diffInMillis < 10 * 1000) { // 绌洪棽灏忎簬10绉掑垯璺宠繃
continue;
+ } else { // 鏈夊叆搴撲换鍔℃垨澶т簬2鍒嗛挓锛屽洖鍘熺偣
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1).eq("crn_no", crn.getId()).in("wrk_sts", 2, 9, 10));
+ if(count == 0 && diffInMillis < 2 * 60 * 1000) {
+ continue;
+ }
}
// 鏈夊悐杞﹀叆搴撴垨鍚婅溅鍑哄簱浠诲姟
--
Gitblit v1.9.1