From ca1ae93196be366e707647c42e3039512a2cf45f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十一月 2024 14:00:24 +0800
Subject: [PATCH] 字段显示，结束任务功能更新，界面调整，测量显示
---
springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 a0f59c0..68a6fb8 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
@@ -45,7 +45,7 @@
@Select("select * from v_cagerelease2 where mateid not in(select mateid from v_cagerelease2 where surplus=0 group by mateid)LIMIT 1;")
GlassInfo SelectOutGlass2();
//寰呭嚭鐗囦换鍔℃煡璇�
- @Select("select * from out_task where task_state=0")
+ @Select("select * from out_task where task_state=0 order by id asc;")
List<StorageTask> SelectOutTask();
//娴佺▼鍗′换鍔℃煡璇�
@Select("select G.flowcard,G.glasstype,G.number,G.mateid,G.tier,G.starttime,G.finishnumber,IF((G.number-G.finishnumber-ku.KuCount)<0,G.number,IFNULL(ku.KuCount,0)) as 'surplus',G.totaltier as id,G.width,G.glassid from (select Gfd.flowcard,Ggf.glasstype,Ggf.number,Ggf.mateid,Ggf.tier,Ggf.finishnumber,Gfd.starttime,Gfd.totaltier,Ggf.width,Ggf.glassid from flowcard as Gfd LEFT JOIN glassinfo as Ggf on Gfd.flowcard=Ggf.flowcard where Gfd.state=1 and Gfd.line=1) as G left join (select glasstype,sum(number) AS KuCount from storage_cage where glasstype is not null and disabled=0 group by glasstype) as ku on G.glasstype=ku.glasstype where G.mateid not in(select mateid from v_cagerelease1 where surplus=0 group by mateid) HAVING surplus>0 order by `g`.`starttime`,`g`.`mateid`,`g`.`finishnumber`,`g`.`tier`LIMIT 1;")
@@ -74,7 +74,7 @@
@Select("select method,flowcard 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=1 and c.number>0 and b.finishnumber<b.number ORDER BY b.finishnumber,b.tier asc 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 a.state=1 and c.number>0 and b.finishnumber<b.number ORDER BY b.finishnumber,b.tier asc limit 1")
GlassInfo SelectOutGlass2(int line);
//鏌ヨ鐩撮�氭ā寮忎笅鏈�鍚庝竴鍧�
@Select("select IFNULL(b.tier, 0) 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")
@@ -106,4 +106,10 @@
//鏌ヨ姝ら厤鐗噄d鏄惁鏈夊彲鍑虹墖鏁伴噺
@Select("SELECT CASE WHEN number >finishnumber THEN '瓒冲' ELSE '涓嶈冻' END AS status FROM glassinfo a WHERE a.flowcard =#{flowcard} AND a.mateid =#{mateid}")
List<String> SelectOutGlass8(String flowcard,int mateid);
+ //鏌ヨ鐜荤拑淇℃伅
+ @Select("select * from glassinfo where glasstype=#{glasstype} limit 1")
+ GlassInfo SelectGlassInfo(int glasstype);
+ //瀹屾垚鍑虹墖闃熷垪鐨勪换鍔�
+ @Update("update out_task set task_state=1 where id=#{id};")
+ void UpdateOutTask(int id);
}
--
Gitblit v1.8.0