From 759b3a648545c518a81e80e9448608e68fb17fd5 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期三, 06 八月 2025 17:55:57 +0800
Subject: [PATCH] 打开罐装线出库外形检测

---
 src/main/java/com/zy/service/impl/MainServiceImpl.java |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 085881e..446ffbb 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -1777,34 +1777,34 @@
                     continue;
                 }
                 // 1083,1086,1089 澶栧舰妫�娴嬪け璐ワ紝涓嶆槸鍘诲紓甯稿彛鐨� 鍋滃湪鍘熷
-//                if (staProtocol.getSiteId() == 1083 || staProtocol.getSiteId() == 1086 || staProtocol.getSiteId() == 1089 && wrkMast.getStaNo() != 1090) {
-//                    boolean back = false;
-//                    String errMsg = "";
-//                    if (staProtocol.isFrontErr()) {
-//                        errMsg = "鍓嶈秴闄�";
-//                        back = true;
-//                    }
-//                    if (!back && staProtocol.isBackErr()) {
-//                        errMsg = "鍚庤秴闄�";
-//                        back = true;
-//                    }
-//                    if (!back && staProtocol.isHighErr()) {
-//                        errMsg = "楂樿秴闄�";
-//                        back = true;
-//                    }
-//                    if (!back && staProtocol.isLeftErr()) {
-//                        errMsg = "宸﹁秴闄�";
-//                        back = true;
-//                    }
-//                    if (!back && staProtocol.isRightErr()) {
-//                        errMsg = "鍙宠秴闄�";
-//                        back = true;
-//                    }
-//                    if (back) {
-//                        log.error("{}绔欑偣锛屽褰㈡娴嬪け璐ワ細{}",site,errMsg);
-//                        continue;
-//                    }
-//                }
+                if (staProtocol.getSiteId() == 1083 || staProtocol.getSiteId() == 1086 || staProtocol.getSiteId() == 1089 && wrkMast.getStaNo() != 1090) {
+                    boolean back = false;
+                    String errMsg = "";
+                    if (staProtocol.isFrontErr()) {
+                        errMsg = "鍓嶈秴闄�";
+                        back = true;
+                    }
+                    if (!back && staProtocol.isBackErr()) {
+                        errMsg = "鍚庤秴闄�";
+                        back = true;
+                    }
+                    if (!back && staProtocol.isHighErr()) {
+                        errMsg = "楂樿秴闄�";
+                        back = true;
+                    }
+                    if (!back && staProtocol.isLeftErr()) {
+                        errMsg = "宸﹁秴闄�";
+                        back = true;
+                    }
+                    if (!back && staProtocol.isRightErr()) {
+                        errMsg = "鍙宠秴闄�";
+                        back = true;
+                    }
+                    if (back) {
+                        log.error("{}绔欑偣锛屽褰㈡娴嬪け璐ワ細{}",site,errMsg);
+                        continue;
+                    }
+                }
                 if (staProtocol.getSiteId() == 1090 && wrkMast.getStaNo() == 1090) {
                     continue;
                 }

--
Gitblit v1.9.1