From 5400d8b310ce6fe6919594a096f3a87307a66e61 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 11 一月 2024 08:47:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 4759704..93c9fe4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -190,7 +190,7 @@
int Selectqueuestate();
// 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑闇�瑕佸嚭
- @Select("SELECT glassid FROM `out_slice` where state=0 order by sequence,id limit 1;")
+ @Select("SELECT glassid FROM `out_slice` where state=0 and framestate!=1 order by sequence,id limit 1;")
String SelectOutSlice();
// 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
--
Gitblit v1.8.0