From b092806a662b99310cdb050292de2721ba06acd9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 十一月 2024 14:43:18 +0800
Subject: [PATCH] 增加测量台直通模式，增加手动参数界面的JSON文件
---
springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
index e908ad8..02da05f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
@@ -17,8 +17,11 @@
@Select("SELECT * FROM queue where glassid=#{glassid}")
List<Queue> selectQueues(@Param("glassid") int glassid);
- @Select("SELECT * FROM queue order by time asc limit 1")
+ @Select("SELECT * FROM queue order by time desc limit 1")
Queue selectLastQueue();
+
+ @Select("SELECT * FROM queue where state<2 order by time desc limit 1")
+ Queue selectLastQueue2();
@Select("SELECT * FROM queue where state<=0")
List<Queue> selectErrorQueues();
@@ -30,12 +33,18 @@
// @Update("UPDATE role_permission SET state = #{state} WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
// void updateState(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);
- @Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time) "+
- "select glassid,flowcard,null,null,width,height,#{glasswidthmm},#{glassheightmm},glasstype,#{state},NOW() from glassinfo where glassid=#{glassid}")
- void insert(@Param("glassid") String glassid, @Param("glasswidthmm") double glasswidthmm, @Param("glassheightmm") double glassheightmm,@Param("state") int state);
+ @Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time,thickness,mateid) "+
+ "select id,flowcard,null,null,width,height,#{glasswidthmm},#{glassheightmm},glasstype,#{state},NOW(),thickness,mateid from glassinfo where id=#{glassid}")
+ int insert(@Param("glassid") Integer glassid, @Param("glasswidthmm") double glasswidthmm, @Param("glassheightmm") double glassheightmm,@Param("state") int state);
@Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time) "+
"values (null,null,null,null,null,null,#{glasswidthmm},#{glassheightmm},null,#{state},NOW())")
void insertMatchFailure(@Param("glasswidthmm") double glasswidthmm, @Param("glassheightmm") double glassheightmm,@Param("state") int state);
+ @Delete("delete from queue where state<=0")
+ void DeleteErrorQueue();
+
+ @Delete("delete from queue where state<=3")
+ void DeleteQueue();
+
}
--
Gitblit v1.8.0