From cfc2855d2fe063e26947bad7277a1091efbb3bbb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 28 十一月 2024 02:16:21 +0800
Subject: [PATCH] 协议地址更新,手动页面更新

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java |   20 ++++++++++++++++----
 1 files changed, 16 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 2772b5c..913c7a4 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
@@ -1,6 +1,7 @@
 package com.example.springboot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.springboot.entity.GlassInfo;
 import com.example.springboot.entity.Queue;
 import com.example.springboot.entity.RolePermission;
 
@@ -20,6 +21,12 @@
     @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=1 order by time desc limit 1")
+    Queue selectLastQueue3();
+
     @Select("SELECT * FROM queue where state<=0")
     List<Queue> selectErrorQueues();
 
@@ -30,9 +37,9 @@
     // @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,thickness) "+
-                        "select glassid,flowcard,null,null,width,height,#{glasswidthmm},#{glassheightmm},glasstype,#{state},NOW(),thickness 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())")
@@ -40,5 +47,10 @@
 
     @Delete("delete from queue where state<=0")
     void DeleteErrorQueue();
-
+    @Delete("delete from queue where state<2")
+    void DeletefromQueue();
+    @Delete("delete from queue where state<1")
+    void DeleteQueue();
+    @Insert("INSERT into queue  (flowcard,glassId,mateid,glasstype,glasswidth,glassheight,thickness,state,time) VALUES (#{flowcard},#{glassId},#{mateid},#{glasstype},#{glasswidth},#{glassheight},#{thickness},1,NOW())")
+    int insertQueueCode(String flowcard,String glassId,int mateid,int glasstype,double glasswidth,double glassheight,double thickness);
 }

--
Gitblit v1.8.0