From ecde4b864d846fb68ecbfd562aa22286abfad9c4 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 22 三月 2024 10:50:06 +0800
Subject: [PATCH] 表格导入（数据处理，页面调整）；测量页面功能实现；
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 66857b4..e2c5d54 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
@@ -14,6 +14,7 @@
import com.example.springboot.entity.RolePermission;
import java.util.List;
+import java.util.Map;
@Mapper
public interface HomeMapper {
@@ -239,7 +240,7 @@
void DeleteStroageCageByCell(Integer cell);
//淇敼鏍煎瓙鐜荤拑鏁伴噺
- @Update("update storage_cage set number=number+#{num} where cell=#{cell}")
+ @Update("update storage_cage set number=ifnull(number,0)+#{num} where cell=#{cell}")
void updateStroageCageByCell(Integer cell, Integer num);
//璁＄畻鏍煎瓙鍐呭墿浣欏搴�
@@ -271,7 +272,7 @@
@Select("select * from flowcard where state!=2")
List<FlowCard> SelectOrderTask();
- @Select("select * from glassinfo where flowcard=#{flowcard} order by mateid,tier")
+ @Select("select gi.*,sum(sc.number) as cageno from glassinfo gi left join storage_cage sc on gi.glasstype=sc.glasstype where gi.flowcard=#{flowcard} group by gi.id order by gi.mateid,gi.tier")
List<GlassInfo> SelectOrderView(String flowcard);
@Update("update flowcard set state=#{state} where flowcard=#{flowcard}")
@@ -280,11 +281,20 @@
@Update("update flowcard set method=#{method} where flowcard=#{flowcard}")
void ModeChange(String flowcard, int method);
- @Update("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype} where state=0")
+ @Update("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype},state=1 where state<=0")
void UpdateQueue(String flowcard,double width,double height,Integer glasstype);
@Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{geTier}")
- void AddGlassNo(Integer flowcard, Integer mateid, Integer geTier);
+ void AddGlassNo(String flowcard, Integer mateid, Integer geTier);
-
+ //娣诲姞鍑虹墖闃熷垪
+ @Insert("INSERT INTO glassinfo (`flowcard`, `glasstype`, `mateid`, `glassid`, `tier`, `films`, `width`, `height`, `thickness`, `number`, `finishnumber`, `sumtier`, `measurenumber`)"+
+ " VALUES (#{flowcard}, #{glasstype}, #{mateid}, #{glassid}, #{tier}, #{films}, #{width}, #{height}, #{thickness}, #{number}, 0, #{sumtier}, 0)")
+ void AddGlassinfo(String flowcard, Integer glasstype, Integer mateid, String glassid, Integer tier, String films, Double width, Double height,Double thickness, Integer number, Integer sumtier);
+ //鏈�澶х幓鐠冪被鍨�
+ @Select("select max(glasstype)+1 from glassinfo")
+ Integer SelectMaxType();
+ //鏌ヨ鍏ㄩ儴鐜荤拑绫诲瀷
+ @Select("select CONCAT(IFNULL(width,''),'_',IFNULL(height,''),'_',IFNULL(thickness,''),'_',IFNULL(films,'')) as type,glasstype from glassinfo GROUP BY width,height,thickness,films")
+ List<Map> SelectType();
}
--
Gitblit v1.8.0