From 7596b7a0c89324a3cd89bb71d35ab2add1fda90f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 18 十月 2023 15:49:25 +0800
Subject: [PATCH] 角色 权限改为多选框勾选修改   主页面玻璃长宽英制尺显示

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 f3bd4c0..921fbaa 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
@@ -68,7 +68,7 @@
   List<alarmmg> SelectAlarmmgInfo();
 
   //鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
-  @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage  ")
+  @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  ")
   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,7 +87,12 @@
   StorageCage SelectGlassInfo(String glassid);
 
   //鏌ヨ鐜荤拑淇℃伅
-  @Select("select * from glass where glassid=#{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};")
   Glass SelectGlassByGlassID(String glassid);
 
   //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�

--
Gitblit v1.8.0