From 87ff1d57df1102d1f689b806f138072f858ef421 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 13:37:36 +0800
Subject: [PATCH] 添加新界面，配置新界面json文件，补充IO状态界面地址，添加报警信息界面json
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 2d5febd..a9598f5 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -32,7 +32,7 @@
List<StorageCage> selectRack4();
// 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
- @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type} limit 1")
+ @Select("select a.*,concat(round(a.glasswidth*b.conversionrate,2),' x ',round(a.glassheight*b.conversionrate,2)) as lengthwidth from storage_cage as a,conver as b where a.state=#{task_type} limit 1")
List<StorageCage> selectinout(@Param("task_type") Integer task_type);
// 鏌ヨ鏄惁瀛樺湪姝よ鍗�
@@ -68,7 +68,7 @@
List<alarmmg> SelectAlarmmgInfo();
//鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
- @Select("select *,concat(round(a.glasswidth*b.Conversionrate,2),' x ',round(a.glassheight*b.Conversionrate,2)) as lengthwidth from storage_cage as a,glass as b ")
+ @Select("select *,concat(round(a.glasswidth*b.conversionrate,2),' x ',round(a.glassheight*b.conversionrate,2)) as lengthwidth from storage_cage as a,conver as b ")
List<StorageCage> SelectCageInfo(short cage);
@Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
@@ -87,12 +87,7 @@
StorageCage SelectGlassInfo(String glassid);
//鏌ヨ鐜荤拑淇℃伅
-// @Select("select * from glass where glassid=#{glassid}")
- @Select("SELECT id,glassid,orderid,\n" +
- " ROUND(width * Conversionrate, 2) AS width,\n" +
- " ROUND(height * Conversionrate, 2) AS height\n" +
- "FROM glass\n" +
- "where glassid=#{glassid};")
+ @Select("select * from glass where glassid=#{glassid}")
Glass SelectGlassByGlassID(String glassid);
//鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
@@ -107,10 +102,25 @@
@Select("select count(*) from storage_cage where glass_id=#{glassId}")
short SelectStorageByGlassId(String glassId);
+ //鏍规嵁璁㈠崟鏌ヨ鐜荤拑淇℃伅
@Select("select * from glass where position(#{orderid} in orderid)")
List<Glass> SelectGlass(String orderid);
- @Select("select * from queue qe inner join glass gl on qe.glassid=gl.glassid where id=#{id}")
- List<Glass> GetQueueInfo(int id);
+ //鑾峰彇涓婄墖闃熷垪淇℃伅
+ @Select("select gl.* from queue qe inner join glass gl on qe.glassid=gl.glassid where qe.id=#{id}")
+ Glass GetQueueInfo(int id);
+
+ //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ @Select("update queue set glassid=#{glassid},state=1 where id=#{id}")
+ void InsertQueueGlassId(String glassid,Short id);
+
+ //纭鎵爜浣嶇幓鐠冧俊鎭�
+ @Select("update queue set state=1 where id=1")
+ void UpdateQueueState();
+
+ //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ @Select("update queue set glassid='' where id=#{id}")
+ void DeleteQueueGlass(String id);
+
}
--
Gitblit v1.8.0