From 58d7b0e12ccd92cf3934f6582b51b5fbcecaa39a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:41 +0800
Subject: [PATCH] 修改注入方式

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java |   95 +++++++++++++++++++++++++----------------------
 1 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 1b0f721..de7f2b9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -2,37 +2,24 @@
 
 import org.apache.ibatis.annotations.*;
 
-import com.example.springboot.entity.Glass;
 import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.StorageTask;
 import com.example.springboot.entity.north_glass_buffer1;
 
 import java.util.List;
 
-import javax.print.DocFlavor.STRING;
 
 @Mapper
 
 public interface SpianMapper {
     // 鍒ゆ柇鐩搁偦绗煎瓙鏄惁鏈夌┖鏍�
-    @Select("select COUNT(if(a.state1=0,cell,null))as cell,ROUND(id/2)as id from (select *,max(state)as state1 from storage_cage a  GROUP BY cage,cell)as a where (a.cage=#{cage1}-1 or a.cage=#{cage1}+1)and if(a.cage<6,a.cage>0 and a.cage<6,a.cage>5) and disabled=0 GROUP BY cage ORDER BY cell desc LIMIT 1")
-    int selectCage(int cage1);
-
-    // @Select("(select*from storage_cage as a where a.state=0 and cage%2=0 ORDER BY
-    // id LIMIT 1)union (select a.* from storage_cage a inner join (select
-    // cage,if(shu2=1,shu3,shu5) as gezi from ( select cage, count(case when
-    // state1=1 and state2=0 then cell else null end)as shu1, count(case when
-    // state1=0 then cell else null end) as shu2, min(case when state1=1 and
-    // state2=0 then cell else null end) as shu3, min(case when state1=0 then cell
-    // else null end) as shu4, min(case when state1=0 or state2=0 then cell else
-    // null end) as shu5 from (select *,max(state) as state1,min(state) as state2
-    // from storage_cage group by cage,cell) as a where cage%2!=0 GROUP BY cage
-    // HAVING shu2>1 or (shu2=1 and shu1>0) ) as sss limit 1)as b on a.cage=b.cage
-    // and a.cell=b.gezi and a.state=0 order by tier limit 1) ORDER BY id LIMIT 1;")
-    // 鑾峰彇璁㈠崟鍙锋帓搴忕殑绌鸿鍗曠瀛�
-    @Select("select a.cage,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1,disabled from storage_cage a left join (select COUNT(*)shu,cage from storage_cage  where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c  on a.cage=c.cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY shu desc,shu2,cage asc; ")
-    List<StorageCage> selectAll(String orderids);
-
+    @Select("select COUNT(if(a.state1=0,cell,0))as cell from (select *,max(state)as state1 from storage_cage a  GROUP BY cage,cell)as a where (a.cage=#{cage1}-1 or a.cage=#{cage1}+1 or a.cage=#{cage1})and if(a.cage<6,a.cage>0 and a.cage<6,a.cage>5) and disabled=0 GROUP BY cage ORDER BY cell desc LIMIT 1")
+    StorageCage selectCage(int cage1);
+    // 鑾峰彇绗煎瓙鍙疯鍗曞彿鎺掑簭鐨勭┖璁㈠崟绗煎瓙
+    @Select("select a.cage,FrameBarcode,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1,max(a.state)as state2,disabled,FrameBarcode from storage_cage a left join (select COUNT(*)shu,cage from storage_cage  where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c  on a.cage=c.cage where (order_id=#{orderids} or ''='') and a.disabled=0 GROUP BY cage,cell HAVING state1=0 ORDER BY shu desc,shu2,state2 asc,cage asc;")
+    List<StorageCage> selectAll(String orderids,String Fbarcode);
+    //浼樺厛鍒ゆ柇涓�娆℃槸鍚︽湁鍚岄摑妗嗙殑绌轰綅
+    @Select("select *,min(state) state1 from storage_cage where width>=(#{width}+#{width2})  GROUP BY cage,cell HAVING state1=0 and  FrameBarcode=#{Fbarcode} and disabled=0 ORDER BY width desc LIMIT 1;")
+    List<StorageCage> selectAllFbarcode(String Fbarcode,double width,double width2);
     // 鑾峰彇鍒ゆ柇璇ユ牸瀛愭槸鍚﹂渶瑕佹妸澶栫墖鎺ㄥ叆鍐呯墖浣嶇疆
     @Select("select state from storage_cage where  cage=#{cage} and cell=#{cell} and tier=1;")
     int selectcell(int cage, int cell);
@@ -42,18 +29,21 @@
     StorageCage selectCage1(int cage1, int cell, double width);
 
     // 鍒ゆ柇绗煎瓙鍐呯幓鐠冩暟
-    @Select("select COUNT(tier)as tier from storage_cage where  cage=#{cage} and cell=#{cell} and state!=0;")
+    @Select("select COUNT(tier)as tier from storage_cage where  cage=#{cage} and cell=#{cell} and state!=0 and state!=3;")
     int selectsum(int cage, int cell);
 
-    // 瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
+    // 瀹屾垚鍑虹墖涓殑鐜荤拑鐘舵��
     @Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=3;")
     void UpdateCageOver(String glassid, int state);
-
+    // 瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
     @Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=2;")
     void UpdateCageadd(String glassid, int state);
-
+    //鏌ヨ鏄惁鏈夎绫诲瀷鐨勪换鍔¤繕鏈畬鎴�
+     // 鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
+    @Select("select COUNT(state) from storage_cage where state=#{state}")
+    int SelectCageState(int state);
     // 鑾峰彇鐜荤拑淇℃伅
-    @Select("select *,ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight from north_glass_buffer1 where barcode=#{glassid}")
+    @Select("select *,ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight,FrameBarcode from north_glass_buffer1 where barcode=#{glassid}")
     north_glass_buffer1 selectGlass(String glassid);
 
     // 鍑虹墖浠诲姟鏌ヨ
@@ -65,7 +55,7 @@
     // desc,tier desc,cell desc LIMIT 1")
     // StorageCage selectOut(String orderId);
     // 鎸夌幓鐠僆D鍑虹墖浠诲姟鏌ヨ
-    @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.glass_id=#{glassid} and state=1 and disabled=0 order by cage desc,tier desc,cell desc LIMIT 1")
+    @Select("select cage,cell,tier,glasswidth,glassheight,ROUND(id/2)as prcId,id from storage_cage as a where a.glass_id=#{glassid} and state=1 and disabled=0 order by cage desc,tier desc,cell desc LIMIT 1")
     StorageCage selectOut2(String glassid);
 
     // 鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
@@ -73,11 +63,11 @@
     int selectGlassState(int cage, int cell);
 
     // 鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
-    @Select("select glass_id,cage,cell,max(state)as shu,ROUND(id/2)as prcid,id from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage),cell desc  limit 1;")
-    StorageCage selectGlassCage(int cage, double width, int cage1, int cage2);
+    @Select("select glass_id,cage,cell,max(state)as shu,ROUND(id/2)as prcid,id,abs(#{cell}-cell)as xuhao from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} and  disabled=0 GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage),xuhao desc  limit 1;")
+    StorageCage selectGlassCage(int cage, double width, int cage1, int cage2,int cell);
 
     // 鍒犻櫎绗煎瓙淇℃伅(鍑虹墖)
-    @Update("update storage_cage as a set state=#{state},glass_id=null,order_id=null,glasswidth=0,a.glassheight=null,a.glasswidthmm=null,a.glassheightmm=null,a.listid=null,a.boxid=null where glass_id=#{glassid} and state=3;")
+    @Update("update storage_cage as a set state=#{state},glass_id=null,FrameBarcode=null,order_id=null,glasswidth=null,a.glassheight=null,a.glasswidthmm=null,a.glassheightmm=null,a.listid=null,a.boxid=null where glass_id=#{glassid} and state=3;")
     void UpdataGlassCage(String glassid, int state);
 
     // 鏀瑰彉鐜荤拑鐘舵�佷负鍑虹墖涓�
@@ -88,9 +78,8 @@
     @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where id=#{id};")
     void UpdataAddCage(String orderid, String glassid, double width, int cage, int cell, int id, int state);
 
-    @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{glass.ordernumber},glasswidth=#{glass.glasslengthmm},glassheight=#{glass.glassheightmm},glasswidthmm=#{glass.glasslength},glassheightmm=#{glass.glassheight},listid=#{glass.listnumber},boxid=#{glass.boxnumber} where id=#{id};")
-    void UpdataAddCage2(String orderid, String glassid, north_glass_buffer1 glass, int cage, int cell, int id,
-            int state);
+    @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{glass.ordernumber},glasswidth=#{widths},glassheight=#{glass.glassheightmm},glasswidthmm=#{glass.glasslength},glassheightmm=#{glass.glassheight},listid=#{glass.listnumber},boxid=#{glass.boxnumber},FrameBarcode=#{glass.frameBarcode} where id=#{id};")
+    void UpdataAddCage2(String orderid, String glassid, north_glass_buffer1 glass, int cage, int cell, int id,int state,Double widths);
 
     // 淇敼绗煎瓙淇℃伅(澶氱墖杩涚墖)
     @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where cage=#{cage} and cell=#{cell} and tier=#{tier};")
@@ -109,15 +98,18 @@
     void UpdataOutCage1(double width, int cage, int cell);
 
     // 璋冩嫧鏇存崲绗煎瓙淇℃伅
-    @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=#{tier})as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth,a.glassheight=b.glassheight,a.glasswidthmm=b.glasswidthmm,a.glassheightmm=b.glassheightmm,a.listid=b.listid,a.boxid=b.boxid where a.id=#{id1}")
+    @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=#{tier})as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=2,a.glasswidth=b.glasswidth,a.glassheight=b.glassheight,a.glasswidthmm=b.glasswidthmm,a.glassheightmm=b.glassheightmm,a.listid=b.listid,a.boxid=b.boxid,a.FrameBarcode=b.FrameBarcode where a.id=#{id1}")
     void UpdateDBCage(int id1, int cage, int cell, int tier);
+     // 杩涚墖鏇存崲绗煎瓙淇℃伅
+     @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=#{tier})as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth,a.glassheight=b.glassheight,a.glasswidthmm=b.glasswidthmm,a.glassheightmm=b.glassheightmm,a.listid=b.listid,a.boxid=b.boxid,a.FrameBarcode=b.FrameBarcode where a.id=#{id1}")
+     void UpdateDBCageAdd(int id1, int cage, int cell, int tier);
 
     // @Insert("insert into user(name, date, address, user_no) values (#{name},
     // #{date}, #{address}, #{userNo})")
     // void insert (Spian spian);
     // 鏂板浠诲姟琛�
-    @Insert("INSERT INTO `canadames`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`,start_time,glass_id,count) VALUES (#{tasktype},#{taskstate},#{shelfrack},#{loadrack},now(),#{glassid},#{count});")
-    void Inserttask(int tasktype, int taskstate, int shelfrack, int loadrack, String glassid, int count);
+    @Insert("INSERT INTO `canadames`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`,start_time,glass_id,count,finsh_time) VALUES (#{tasktype},#{taskstate},#{shelfrack},#{loadrack},now(),#{glassid},#{count},#{qidong});")
+    void Inserttask(int tasktype, int taskstate, int shelfrack, int loadrack, String glassid, int count,int qidong);
 
     // 淇敼浠诲姟琛�
     @Update("update storage_task set task_state=#{state} where task_type=#{type} and task_state=0;")
@@ -132,11 +124,11 @@
     String SelectOrderout();
 
     // 鍐呭鐗囪皟鎹�
-    @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=1)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth,a.glassheight=b.glassheight,a.glasswidthmm=b.glasswidthmm,a.glassheightmm=b.glassheightmm,a.listid=b.listid,a.boxid=b.boxid where a.cage=#{cage} and a.cell=#{cell} and a.tier=2")
+    @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=1)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth,a.glassheight=b.glassheight,a.glasswidthmm=b.glasswidthmm,a.glassheightmm=b.glassheightmm,a.listid=b.listid,a.boxid=b.boxid,a.FrameBarcode=b.FrameBarcode where a.cage=#{cage} and a.cell=#{cell} and a.tier=2")
     void UpdateDBCage1(int cage, int cell);
 
     // 娓呴櫎鍐呯墖鏁版嵁
-    @Update("update storage_cage a set glass_id='',order_id='',state=0,glasswidth=0,glassheight=0,glasswidthmm=0,glassheightmm=0,listid=null,boxid=null where a.cage=#{cage} and a.cell=#{cell} and a.tier=1;")
+    @Update("update storage_cage a set glass_id=null,order_id=null,state=0,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,listid=null,boxid=null,FrameBarcode=null where a.cage=#{cage} and a.cell=#{cell} and a.tier=1;")
     void UpdateDBCage2(int cage, int cell);
 
     // 鍒ゆ柇鏄惁鏈夎皟鎷ㄥ畬鍚庡嚭鐗囩殑浠诲姟
@@ -144,8 +136,8 @@
     north_glass_buffer1 SelectDBOut();
 
     // 鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
-    @Select("select glass_id from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
-    String SelectGlassid(int cage, int cell);
+    @Select("select glass_id,glasswidth from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
+    StorageCage SelectGlassid(int cage, int cell);
 
     // 鍒ゆ柇鏈夊嚑鍧楃幓鐠冭繕鍦ㄥ嚭鐗囦腑
     @Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
@@ -211,17 +203,20 @@
     // 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
     @Select("SELECT count(*) FROM `out_slice` where state=1;")
     int SelectOutSliceshu();
+    //鍒ゆ柇鏄惁鏈夎皟鎷ㄤ换鍔℃湭瀹屾垚
+    @Select("SELECT count(*) FROM `storage_cage` where state=#{state};")
+    int Selectcageout(int state);
 
     // 鏇存柊鍑虹墖闃熷垪鐨勪换鍔＄姸鎬�
-    @Update("update out_slice set state=#{state} where glassid=#{glassid}")
-    void OverOutSlice(String glassid, int state);
+    @Update("update out_slice set state=#{state} where glassid=#{glassid} and state=#{state2}")
+    void OverOutSlice(String glassid, int state,int state2);
 
     // 鑾峰彇鐜荤拑鐨勯摑妗唅d
     @Select("select barcode from out_slice where glassid=#{glassid};")
     String SelectBarcode(String glassId);
 
     // 鑾峰彇鍑虹墖闃熷垪鐨勯摑妗嗘槸鍚﹀叏閮ㄥ畬鎴�
-    @Select("select MIN(state) from out_slice where barcode=#{barcode};")
+    @Select("select count(*) from out_slice where barcode=#{barcode} and (state=1 or state=0);")
     int SelectOverState(String barcode);
 
     // 鍒犻櫎鍑虹墖闃熷垪璇ラ摑妗嗙殑id
@@ -231,4 +226,16 @@
     // 鎶婅杩涚墖鐨勭幓鐠冩洿鏂板埌鍑虹墖闃熷垪
     @Select("update out_slice set state=0 where glassId=#{glassId} and state=3")
     void UpdateAddQueue(String glassId);
-}
+    //鏂板鏃ュ織琛ㄦ牸
+    @Insert("INSERT INTO `canadames`.`log`( `text`,time) VALUES (#{logtxt},now());")
+    void insertlog(String logtxt);
+    //鑾峰彇璇ュ崐鍖烘槸鍚︽湁鎵ц鐨勪换鍔�
+    @Select(" select count(*) from storage_cage where state=#{state} and cage>#{cage1} and cage<#{cage2}")
+    int SelectCageTask(int state,int cage1,int cage2);
+    //鍒ゆ柇鐜荤拑鏄惁绂佺敤
+    @Select(" select disabled from storage_cage where glass_id=#{glassid} limit 1;")
+    StorageCage SelectCageGlassState(String glassid);
+    //鍒ゆ柇姹囨姤鐨刬d鏄惁姝ｇ‘
+    @Select("SELECT count(*) FROM `storage_cage` where state!=0 and glass_id=#{glassid}")
+    int SelectHB(String glassid);
+}
\ No newline at end of file

--
Gitblit v1.8.0