From fccf8364364c36d15de26aa699f91228a74b6e10 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 13:17:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/BasRgvErrService.java | 1
src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java | 4 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 131 +++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/core/MainProcess.java | 18 +++--
src/main/resources/license.lic | 0
5 files changed, 146 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/BasRgvErrService.java b/src/main/java/com/zy/asrs/service/BasRgvErrService.java
index 754bb63..74f6926 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvErrService.java
+++ b/src/main/java/com/zy/asrs/service/BasRgvErrService.java
@@ -5,4 +5,5 @@
public interface BasRgvErrService extends IService<BasRgvErr> {
+ BasRgvErr findLatest(int i);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java
index dcf62fd..c89d490 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java
@@ -9,4 +9,8 @@
@Service("basRgvErrService")
public class BasRgvErrServiceImpl extends ServiceImpl<BasRgvErrMapper, BasRgvErr> implements BasRgvErrService {
+ @Override
+ public BasRgvErr findLatest(int i) {
+ return null;
+ }
}
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 f0f9ec6..dd01468 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -21,6 +21,7 @@
import com.zy.common.utils.HttpHandler;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
+import com.zy.core.RgvThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
@@ -66,6 +67,12 @@
private FillingMastService fillingMastService;
@Autowired
private VacuumMastService vacuumMastService;
+ @Autowired
+ private BasErrLogService basErrLogService;
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
+ @Autowired
+ private BasRgvErrService basRgvErrService;
@Value("${wms.url}")
private String wmsUrl;
@@ -547,6 +554,130 @@
}
}
+ public synchronized void recCrnErr() {
+ Date now = new Date();
+
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ SiemensRgvThread rgvThread = (SiemensRgvThread) SlaveConnection.get(SlaveType.Rgv, 1);
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null) {
+ return;
+ }
+ if (true) {
+// if (crnProtocol.getModeType() != CrnModeType.STOP) {
+ // 鏈変换鍔�
+ if (rgvProtocol.getTaskNo1() != 0) {
+
+ BasErrLog latest = basErrLogService.findLatestByTaskNo(1, rgvProtocol.getTaskNo1());
+ // 鏈夊紓甯�
+ if (latest == null) {
+ if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm() > 0) {
+ WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+ .setSqlSelect("TOP 1 wrk_no as wrkNo , wrk_sts as wrkSts,wrk_start as wrkStart,wrk_end as wrkEnd, create_time as createTime")
+ .eq("wrk_No", rgvProtocol.getTaskNo1())
+ .orderBy("create_time", false)
+
+ );
+ if (wrkMastSta == null) {
+ return;
+ }
+ BasRgvErr rgvErr = basRgvErrService.selectById(rgvProtocol.getAlarm());
+ String errName = rgvErr == null ? String.valueOf(rgvProtocol.getAlarm()) : rgvErr.getErrName();
+ BasErrLog basErrLog = new BasErrLog(
+ null, // 缂栧彿
+ wrkMastSta.getWrkNo().intValue(), // 宸ヤ綔鍙�
+ now, // 鍙戠敓鏃堕棿
+ null, // 缁撴潫鏃堕棿
+ wrkMastSta.getWrkSts().longValue(), // 宸ヤ綔鐘舵��
+ wrkMastSta.getType(), // 鍏ュ嚭搴撶被鍨�
+ 1, // 鍫嗗灈鏈�
+ null, // plc
+ null, // 鐩爣搴撲綅
+ wrkMastSta.getWrkEnd(), // 鐩爣绔�
+ wrkMastSta.getWrkEnd(), // 婧愮珯
+ null, // 婧愬簱浣�
+ null, // 鏉＄爜
+ (int) rgvProtocol.getAlarm(), // 寮傚父鐮�
+ errName, // 寮傚父
+ 1, // 寮傚父鎯呭喌
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ "浠诲姟涓紓甯�" // 澶囨敞
+ );
+ if (!basErrLogService.insert(basErrLog)) {
+
+ }
+ }
+ } else {
+ // 寮傚父淇
+ if (rgvProtocol.getAlarm() == null || rgvProtocol.getAlarm() == 0) {
+ latest.setEndTime(now);
+ latest.setUpdateTime(now);
+ latest.setStatus(2);
+ if (!basErrLogService.updateById(latest)) {
+
+ }
+ }
+ }
+ // 鏃犱换鍔�
+ } else {
+ BasErrLog latest = basErrLogService.findLatest(1);
+
+ // 鏈夊紓甯�
+ if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm() > 0) {
+
+ // 璁板綍鏂板紓甯�
+ if (latest == null || (latest.getErrCode() != rgvProtocol.getAlarm().intValue())) {
+ BasRgvErr rgvErr = basRgvErrService.selectById(rgvProtocol.getAlarm());
+ String errName = rgvErr == null ? String.valueOf(rgvProtocol.getAlarm()) : rgvErr.getErrName();
+ BasErrLog basErrLog = new BasErrLog(
+ null, // 缂栧彿
+ null, // 宸ヤ綔鍙�
+ now, // 鍙戠敓鏃堕棿
+ null, // 缁撴潫鏃堕棿
+ null, // 宸ヤ綔鐘舵��
+ null, // 鍏ュ嚭搴撶被鍨�
+ 1, // 鍫嗗灈鏈�
+ null, // plc
+ null, // 鐩爣搴撲綅
+ null, // 鐩爣绔�
+ null, // 婧愮珯
+ null, // 婧愬簱浣�
+ null, // 鏉＄爜
+ (int) rgvProtocol.getAlarm(), // 寮傚父鐮�
+ errName, // 寮傚父
+ 1, // 寮傚父鎯呭喌
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ "鏃犱换鍔″紓甯�" // 澶囨敞
+ );
+ if (!basErrLogService.insert(basErrLog)) {
+
+ }
+ }
+ // 鏃犲紓甯�
+ } else {
+ // 寮傚父淇
+ if (latest != null && latest.getStatus() == 1) {
+ latest.setEndTime(now);
+ latest.setUpdateTime(now);
+ latest.setStatus(2);
+ if (!basErrLogService.updateById(latest)) {
+
+ }
+ }
+ }
+ }
+ }
+
+
+// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄紓甯镐俊鎭褰曟墽琛屽畬鎴�");
+ }
+
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index bb507f6..0a54ccc 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -43,14 +43,16 @@
continue;
}
// 婕旂ず
-// mainService.getRgvTask();
-// mainService.RGVDemoShow0();
-// mainService.RGVDemoShow1();
-// mainService.RGVDemoShow2();
- //浠诲姟鐢熸垚
-// mainService.DevpTaskAndPut();
-// //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-// mainService.rgvRunWrkMastFullSta();
+ mainService.getRgvTask();
+ mainService.RGVDemoShow0();
+ mainService.RGVDemoShow1();
+ mainService.RGVDemoShow2();
+// 浠诲姟鐢熸垚
+ mainService.DevpTaskAndPut();
+ //鎵ц灏忚溅璐х墿鎼繍浠诲姟
+ mainService.rgvRunWrkMastFullSta();
+
+ mainService.recCrnErr();
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index b251114..b796202 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1