From 15ae1a2b9f83cb6ef7dc393767d814c71451b850 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期二, 12 八月 2025 15:26:54 +0800
Subject: [PATCH] 记录输送线异常日志

---
 src/main/java/com/zy/service/impl/BasDevpErrLogServiceImpl.java |   10 ++++++++++
 src/main/java/com/zy/controller/SiteController.java             |    2 +-
 src/main/java/com/zy/service/BasDevpErrLogService.java          |    1 +
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
index 0728e2c..b26403a 100644
--- a/src/main/java/com/zy/controller/SiteController.java
+++ b/src/main/java/com/zy/controller/SiteController.java
@@ -299,7 +299,7 @@
             vo.setError("鍙宠秴闄�");
             list.add(vo);
         }
-        if (staProtocol.isBarcodeErr()){
+        if (staProtocol.isBarcodeErr() && entry.getKey() != 1083 && entry.getKey() != 1086 && entry.getKey() != 1089 ){
             PlcErrorTableVo vo = new PlcErrorTableVo();
             vo.setNo(entry.getKey());   //  搴忓彿
             vo.setPlcDesc("鎵爜澶辫触");
diff --git a/src/main/java/com/zy/service/BasDevpErrLogService.java b/src/main/java/com/zy/service/BasDevpErrLogService.java
index d036901..fc51e8f 100644
--- a/src/main/java/com/zy/service/BasDevpErrLogService.java
+++ b/src/main/java/com/zy/service/BasDevpErrLogService.java
@@ -7,4 +7,5 @@
 
     BasDevpErrLog findLatestByTaskNo(Integer sourceStaNo, Integer taskNo);
 
+    BasDevpErrLog findLatest(Integer sourceStaNo);
 }
diff --git a/src/main/java/com/zy/service/impl/BasDevpErrLogServiceImpl.java b/src/main/java/com/zy/service/impl/BasDevpErrLogServiceImpl.java
index 5f0adcb..c1ec856 100644
--- a/src/main/java/com/zy/service/impl/BasDevpErrLogServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/BasDevpErrLogServiceImpl.java
@@ -22,4 +22,14 @@
         }
     }
 
+    @Override
+    public BasDevpErrLog findLatest(Integer sourceStaNo) {
+        List<BasDevpErrLog> basErrLogs = this.baseMapper.selectList(new EntityWrapper<BasDevpErrLog>().eq("source_sta_no", sourceStaNo).orderBy("start_time", false));
+        if (basErrLogs == null || basErrLogs.size() == 0) {
+            return null;
+        } else {
+            return basErrLogs.get(0);
+        }
+    }
+
 }

--
Gitblit v1.9.1