From 1e5f84103130d1dbb47657fb4045176c3b27097d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 24 三月 2024 17:20:31 +0800
Subject: [PATCH] 测量台测试后程序修改

---
 springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
index b70f990..54bf11e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
@@ -63,11 +63,11 @@
     }
 
     // 鍖归厤閫昏緫
-    public GlassInfo Normal(double width, double height, String line) {
+    public boolean Normal(double width, double height, String line) {
         List<Queue> ErrowQueues= QueueMapper.selectErrorQueues();
         if (ErrowQueues.size()>0) {
             //System.out.println("鏈夊尮閰嶅け璐ユ暟鎹湭鍘婚櫎");
-            return new GlassInfo();
+            return false;
         }
         List<GlassInfo> Result = NormalGlassInfo(width, height, "1");
         if (Result.size() == 1) {
@@ -77,7 +77,7 @@
             GlassInfoMapper.updatemeasurenumber(GlassInfo.getId());
             System.out.println("鍖归厤鎴愬姛");
             System.out.println(GlassInfo.getGlassid());
-            return GlassInfo;
+            return true;
         } else if (Result.size() > 1) {
             // 鍖归厤澶辫触 鍖归厤鍒板鏉$鍚堢殑鏁版嵁 娣诲姞鏁版嵁
             QueueMapper.insertMatchFailure(width, height, 0);
@@ -88,7 +88,7 @@
             QueueMapper.insertMatchFailure(width, height, -1);
             System.out.println("鏈壘鍒扮鍚堢殑鏁版嵁");
         }
-        return new GlassInfo();
+        return false;
     }
 
     // Execl琛ㄦ牸 浼犲叆鏂囦欢璺緞

--
Gitblit v1.8.0