From 328f9b1f7a046378ef5d8f2b8337770fff372cc7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期六, 26 十月 2024 19:12:07 +0800
Subject: [PATCH] 更新测试后代码
---
springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
index e0d5bb0..4056b3d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
@@ -48,7 +48,7 @@
@Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{tier};")
void AddFinishNumber(String flowcard,int mateid,int tier);
//鑾峰彇褰撳墠浠诲姟鐨刬d
- @Select("select id from storage_task where task_state=0 and glass_id=#{glassid} LIMIT 1")
+ @Select("select id from storage_task where task_state=0 and glass_id=#{glassid} ORDER BY id desc LIMIT 1")
GlassInfo SelectTaskId(String glassid);
//鍒犻櫎娴嬮噺琛ㄧ殑淇℃伅
@Delete("delete from queue where glassid=#{glassid}")
@@ -57,10 +57,10 @@
@Select("select method from flowcard where state=1 and line=#{line} ORDER BY starttime LIMIT 1;")
GlassInfo SelectMethod(int line);
//鐩村嚭妯″紡浠诲姟鏌ヨ
- @Select("select b.flowcard,b.glassid,b.glasstype,b.mateid,b.width,b.tier,a.totaltier as id,IFNULL(c.number,0)as number,b.glassid from flowcard a left join glassinfo b on a.flowcard=b.flowcard left join(select sum(number)as number,glasstype from storage_cage GROUP BY glasstype)c on b.glasstype=c.glasstype where a.line=#{line} and c.number>0 limit 1")
+ @Select("select b.flowcard,b.glassid,b.glasstype,b.mateid,b.width,b.tier,a.totaltier as id,IFNULL(c.number,0)as number,b.glassid from flowcard a left join glassinfo b on a.flowcard=b.flowcard left join(select sum(number)as number,glasstype from storage_cage GROUP BY glasstype)c on b.glasstype=c.glasstype where a.line=1 and c.number>0 limit 1")
GlassInfo SelectOutGlass2(int line);
//鏌ヨ鐩撮�氭ā寮忎笅鏈�鍚庝竴鍧�
- @Select("select b.tier from flowcard a left join glassinfo b on a.flowcard=b.flowcard left join(select sum(number)as number,glasstype from storage_cage GROUP BY glasstype)c on b.glasstype=c.glasstype where a.line=2 and c.number>0 ORDER BY b.tier desc LIMIT 1")
+ @Select("select b.tier from flowcard a left join glassinfo b on a.flowcard=b.flowcard left join(select sum(number)as number,glasstype from storage_cage GROUP BY glasstype)c on b.glasstype=c.glasstype where a.line=#{line} and c.number>0 ORDER BY b.tier desc LIMIT 1")
int SelectOutGlassend(int line);
//澧炲姞绗煎瓙琛ㄥ楂�
@Select("update storage_cage a set a.glasswidth=#{width},a.glassheight=#{height} where id=#{id} ")
--
Gitblit v1.8.0