From 5780c58879296cfced72012c8831c1d3cf4dafb2 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 十一月 2024 00:33:13 +0800
Subject: [PATCH] 增加任务队列 任务日志，客户名称字段
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 2164519..148c234 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
@@ -235,7 +235,7 @@
Short SelectOutingQueueCount(String frameNo);
// 鏌ヨ鐞嗙墖绗煎唴淇℃伅
- @Select("select * from storage_cage")
+ @Select("select *,b.customer from storage_cage a left join flowcard b on a.flowcard=b.flowcard")
List<StorageCage> SelectStorageCageInfo();
// 鍒犻櫎鏍煎瓙鍐呯幓鐠冧俊鎭�
@@ -247,7 +247,7 @@
void updateStroageCageByCell(Integer cell, Integer num);
// 璁＄畻鏍煎瓙鍐呭墿浣欏搴�
- @Update("update storage_cage set width=4300-if(glasswidth is null,0,glasswidth+300)*number where cell=#{cell}")
+ @Update("update storage_cage set width=4300-if(glasswidth is null,0,glasswidth+300)*number+300 where cell=#{cell}")
void UpdateStroageCageWidthByCell(Integer cell);
// 鏍规嵁浠诲姟绫诲瀷鑾峰彇浠诲姟
@@ -278,12 +278,12 @@
@Update("update storage_cage set glasstype=#{glassInfo.glasstype},mateid=#{glassInfo.mateid},glass_id=#{glassInfo.glassid},flowcard=#{glassInfo.flowcard},glasswidth=#{glassInfo.width},glassheight=#{glassInfo.height},thickness=#{glassInfo.thickness},films=#{glassInfo.films},number=0 where cell=#{cell}")
void StorageCageAddGlass(String cell, GlassInfo glassInfo);
- @Select("select * from flowcard where state!=2")
+ @Select("select id,flowcard,Customer,totaltier,line,state,method,starttime,orderstate from flowcard where state!=2")
List<Flowcard> SelectOrderTask();
// @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);
- @Select("select gi.id, gi.glasstype, gi.mateid, gi.glassid, gi.tier, gi.films, gi.width, gi.height, gi.thickness, gi.number, gi.finishnumber, gi.sumtier, gi.measurenumber,sum(sc.number) as cageno,IFNULL(c.orderstate,0) as orderstate from glassinfo gi left join storage_cage sc on gi.glasstype=sc.glasstype left join flowcard c on gi.flowcard=c.flowcard where gi.flowcard=#{flowcard} group by gi.id,orderstate order by gi.mateid,gi.tier")
+ @Select("select gi.id,gi.customer, gi.glasstype, gi.mateid, gi.glassid, gi.tier, gi.films, gi.width, gi.height, gi.thickness, gi.number, gi.finishnumber, gi.sumtier, gi.measurenumber,sum(sc.number) as cageno,IFNULL(c.orderstate,0) as orderstate from glassinfo gi left join storage_cage sc on gi.glasstype=sc.glasstype left join flowcard c on gi.flowcard=c.flowcard where gi.flowcard=#{flowcard} group by gi.id,orderstate order by gi.mateid,gi.tier")
List<GlassInfo> SelectOrderView(String flowcard);
@@ -307,7 +307,12 @@
// int deleteGlassinfo(String flowcard);
@Update("Update flowcard set state=2, flowcard=CONCAT('宸插垹闄�', #{flowcard}),orderstate=0 where flowcard=#{flowcard}")
int deleteFlowcard(String flowcard);
-
+ //淇敼鍑虹墖闃熷垪鐘舵��
+ @Update("Update out_task set task_state=#{state} where id=#{id}")
+ int UpdateOutTask(Integer id, Integer state);
+ //鍒犻櫎鍑虹墖闃熷垪
+ @Delete("DELETE from out_task where id=#{id}")
+ int DeleteOutTask(Integer id);
@Update("Update glassinfo set flowcard=CONCAT('宸插垹闄�', #{flowcard}) where flowcard=#{flowcard}")
int deleteGlassinfo(String flowcard);
//浜哄伐鍖归厤淇敼涓�鏉�
@@ -325,11 +330,11 @@
void OutGlassNo(Integer glasstype);
// 娣诲姞鍑虹墖闃熷垪
- @Insert("INSERT INTO glassinfo (`flowcard`, `glasstype`, `mateid`, `glassid`, `tier`, `films`, `width`, `height`, `thickness`, `number`, `finishnumber`, `sumtier`, `measurenumber`)"
+ @Insert("INSERT INTO glassinfo (`flowcard`, `glasstype`, `mateid`, `glassid`, `tier`, `films`, `width`, `height`, `thickness`, `number`, `finishnumber`, `sumtier`, `measurenumber`,Customer)"
+
- " VALUES (#{flowcard}, #{glasstype}, #{mateid}, #{glassid}, #{tier}, #{films}, CASE WHEN #{width} > #{height} THEN #{width} ELSE #{height} END, CASE WHEN #{height} > #{width} THEN #{width} ELSE #{height} END, #{thickness}, #{number}, 0, #{sumtier}, 0)")
+ " VALUES (#{flowcard}, #{glasstype}, #{mateid}, #{glassid}, #{tier}, #{films}, CASE WHEN #{width} > #{height} THEN #{width} ELSE #{height} END, CASE WHEN #{height} > #{width} THEN #{width} ELSE #{height} END, #{thickness}, #{number}, 0, #{sumtier}, 0, #{Customer})")
void AddGlassinfo(String flowcard, Integer glasstype, Integer mateid, String glassid, Integer tier, String films,
- Double width, Double height, Double thickness, Integer number, Integer sumtier);
+ Double width, Double height, Double thickness, Integer number, Integer sumtier,String Customer);
// 鏈�澶х幓鐠冪被鍨�
@Select("select max(glasstype)+1 from glassinfo")
@@ -360,9 +365,9 @@
List<StorageCage> SelectStorageCageByCage(Integer cage);
// 娣诲姞鍑虹墖闃熷垪
- @Insert("INSERT INTO flowcard(`flowcard`, `totaltier`, `number`, `line`, `state`, `method`, `starttime`) "
- +" select #{flowcard}, 0, #{number}, 0, 0, 0, now() where 0=( select count(*) from flowcard where flowcard=#{flowcard});")
- void InsertFlowcard(String flowcard, Integer number);
+ @Insert("INSERT INTO flowcard(`flowcard`, `totaltier`, `number`, `line`, `state`, `method`, `starttime`,Customer) "
+ +" select #{flowcard}, 0, #{number}, 0, 0, 0, now(),#{Customer} where 0=( select count(*) from flowcard where flowcard=#{flowcard});")
+ void InsertFlowcard(String flowcard, Integer number,String Customer);
@Delete("DELETE FROM queue WHERE id = (SELECT id FROM ( SELECT id FROM queue WHERE glasstype = #{glassId} ORDER BY time ASC LIMIT 1) AS temp);")
void DeletequeueByGlassid(String glassId);
@@ -372,4 +377,10 @@
//淇敼娴嬮噺璁惧畾鑶滅郴鍜屽帤搴�
@Update("UPDATE measuresetting SET `films` = #{films}, `thickness` = #{thickness} WHERE `id` = 1;")
int SaveMeasure(String films, Integer thickness);
+ //鏌ヨ鍑虹墖闃熷垪鏁版嵁
+ @Select("SELECT a.id,a.flowcard,customer,a.mateid,a.tier,b.films,b.thickness,b.width,b.height,a.task_state as state FROM `out_task` a left join glassinfo b on a.glasstype=b.glasstype where task_state!=1 ORDER BY task_state")
+ List<Map>SelectOutTask();
+ //鏌ヨ鍑虹墖璁板綍鏁版嵁
+ @Select(" select a.id,a.flowcard,customer,a.mateid,a.tier,b.films,b.thickness,b.width,b.height,a.task_state,a.shelf_rack as cell from storage_task a left join glassinfo b on a.glasstype=b.glasstype where task_state=1 and task_type=1 ORDER BY a.id desc LIMIT 6;")
+ List<Map>SelectOutLog();
}
--
Gitblit v1.8.0