From a58b8b33bc5cf64f083d1e0a6d32a17d2749fcd1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 23 二月 2024 11:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java |  133 ++++++++++++++++++++++++++++++++------------
 1 files changed, 97 insertions(+), 36 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 d6236e3..f85627b 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
@@ -3,12 +3,13 @@
 import org.apache.ibatis.annotations.*;
 
 import com.example.springboot.entity.CarPosition;
-import com.example.springboot.entity.Glass;
 import com.example.springboot.entity.StorageCage;
+import com.example.springboot.entity.StorageTask;
 import com.example.springboot.entity.alarmmg;
 import com.example.springboot.entity.north_glass_buffer1;
-import com.example.springboot.entity.north_glass_buffer1_frames;
 import com.example.springboot.entity.Out_slice;
+import com.example.springboot.entity.Queue;
+import com.example.springboot.entity.RolePermission;
 
 import java.util.List;
 
@@ -34,8 +35,10 @@
   @Select("SELECT case when tier=1 then cage else 0 end as cage,case when tier=1 then state else 0 end as state,sum(case when tier=1 then glasswidth/2750*2 else 0 end) as glasswidth,sum(case when tier=2 then glasswidth/2750*2 else 0 end) as width  from storage_cage where cage<=5  group by cage,cell order by cage desc,cell desc")
   List<StorageCage> selectRack4();
 
+
+
   // 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
-  @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type}")
+  @Select("select * from storage_cage where state=#{task_type}")
   List<StorageCage> selectinout(@Param("task_type") Integer task_type);
 
   // 鏌ヨ鏄惁瀛樺湪姝よ鍗�
@@ -55,26 +58,23 @@
   short SelectInTask();
 
   // 鎵嬪姩瀹屾垚浠诲姟
-  @Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0")
-  void UpdateTask(@Param("task_type") Integer task_type);
+  @Update("update storage_task set task_state=1 where task_type=#{task_type} and glass_id=#{glassid}")
+  void UpdateTask(@Param("task_type") Integer task_type,String glassid);
 
   // 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
   @Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2")
   void UpdateCageTask1(@Param("glassid") String glassid);
-
-  // 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
-  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid} and state=3")
-  void UpdateCageTask2(@Param("glassid") String glassid);
 
   //鑾峰彇鎶ヨ淇℃伅
   @Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
   List<alarmmg> SelectAlarmmgInfo();
 
   //鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
-  @Select("select *,concat(round(a.glasswidth),' x ',round(a.glassheight)) as lengthwidth from storage_cage as a")
-  List<StorageCage> SelectCageInfo(short cage);
+  @Select("select * from storage_cage where position(#{cage} in ifnull(glass_id,\"\"))")
+  List<StorageCage> SelectCageInfo(String cage);
 
-  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
+  // 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
+  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,listid=null,boxid=null,FrameBarcode=null where glass_id=#{glassid}")
   void DeleteByGlassID(String glassid);
 
   //鏌ヨ灏忚溅浣嶇疆
@@ -89,6 +89,10 @@
   @Select("select * from storage_cage where glass_id=#{glassid}")
   StorageCage SelectGlassInfo(String glassid);
 
+  //鏍规嵁鐜荤拑id鏌ヨ鐞嗙墖绗间俊鎭�
+  @Select("select * from storage_cage where glass_id=#{glassid}")
+  List<StorageCage> SelectStorageInfoByGlassId(String glassid);
+
   //鏌ヨ鐜荤拑淇℃伅
 //  @Select("select * from glass where glassid=#{glassid}")
   @Select("SELECT ordernumber,listnumber,boxnumber,barcode,glasslength,glassheight,glasslength_mm,glassheight_mm FROM north_glass_buffer1 where barcode=#{barcode}")
@@ -99,8 +103,8 @@
   void Disabled(short cage, short cell, short disabled);
 
   //鐞嗙墖绗兼柊澧炵幓鐠�
-  @Update("update storage_cage set state=1,glass_id=#{glass.barcode},order_id=#{glass.ordernumber},glasswidth=#{glass.glasslengthMm},glassheight=#{glass.glassheightMm} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
-  void Inglassid(north_glass_buffer1 glass, short cage, short cell, short tier);
+  @Update("update storage_cage set state=1,glass_id=#{glass.glassId},order_id=#{glass.orderId},glasswidth=#{glass.glasswidth},glassheight=#{glass.glassheight},glasswidthmm=#{glass.glasswidthmm},glassheightmm=#{glass.glassheightmm},listid=#{glass.listId},boxid=#{glass.boxId} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
+  void Inglassid(Queue glass, short cage, short cell, short tier);
 
   //鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑
   @Select("select count(*) from storage_cage where glass_id=#{glassId}")
@@ -111,19 +115,19 @@
   List<north_glass_buffer1> SelectGlass(String orderid);
 
   //鑾峰彇涓婄墖闃熷垪淇℃伅
-  @Select("select glassid from queue where id=#{id}")
-  String GetQueueInfo(int id);
+  @Select("select * from queue where id=#{id}")
+  Queue GetQueueInfo(int id);
 
   //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
-  @Select("update queue set glassid=#{glassid},state=1 where id=#{id}")
-  void InsertQueueGlassId(String glassid,Short id);
+  @Update("update queue set glassid=#{queue.glassId},orderid=#{queue.orderId},listId=#{queue.listId},boxId=#{queue.boxId},glasswidth=#{queue.glasswidth},glassheight=#{queue.glassheight},glasswidthmm=#{queue.glasswidthmm},glassheightmm=#{queue.glassheightmm},state=1 where id=#{id}")
+  void InsertQueueGlassId(Queue queue,Short id);
 
   //纭鎵爜浣嶇幓鐠冧俊鎭�
-  @Select("update queue set state=1 where id=1")
+  @Update("update queue set state=1 where id=1")
   void UpdateQueueState();
 
   //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
-  @Select("update queue set glassid='',state=0 where id=#{id}")
+  @Update("update queue set glassid=null,orderid=null,listid=null,boxid=null,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,state=0 where id=#{id}")
   void DeleteQueueGlass(String id);
 
   //鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
@@ -135,36 +139,93 @@
   north_glass_buffer1 SelectBoxNo(String glassid);
 
   //鏌ヨ鍑虹墖闃熷垪淇℃伅
-  @Select("select * from out_slice where state=0 or state=1")
+  @Select("select * from out_slice order by sequence")
   List<Out_slice> SelectProductionqueue();
 
   //鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
   @Select("select * from storage_cage where glass_id=#{glassid}")
   StorageCage SelectStorageGlassById(String glassid);
 
+  //鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
+  @Select("select * from storage_cage where glass_id=#{glassid}")
+  List<StorageCage> SelectStoragesGlassById(String glassid);
 
-  //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
-  @Select("update out_slice set state=3 where id=#{id}")
-  void DeleteProductionQueueGlass(Short id);
+
+  // //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+  // @Update("update out_slice set state=4 where barcode=#{FrameNo} and (state=0 or state=1 or state=2)")
+  // void DeleteProductionQueueGlass(String id);
 
   //鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
   @Select("select * from north_glass_buffer1 where FrameBarcode=#{FrameBarcode}")
   List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode);
 
-  //鏌ヨ鏍规嵁id鏌ヨ
-  @Select("select b.* from storage_cage a inner join out_slice b on a.glass_id=b.glassId where b.glassId=#{glassId}")
-  List<Out_slice> SelectOutSliceById(String glassId);
 
-  //鏌ヨ鐜荤拑id鏄惁
-  @Select("select Flip from north_glass_buffer1_frames where Barcode=#{frameBarcode} limit 1")
-  String SelectFlipByFrameBarcode(String frameBarcode);
-
-  //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
-  @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1)")
+  //鏍规嵁鐜荤拑id鏌ヨ鍑虹墖闃熷垪淇℃伅
+  @Select("select * from out_slice where glassid=#{getbarcode}")
   Out_slice SelectQueueByglassid(String getbarcode);
 
-  //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
-  @Select("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip});")
-  void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm);
+  //娣诲姞鍑虹墖闃熷垪
+  @Insert("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position` ,`orderid` ,`listid` ,`boxid` ,`glasswidthmm` ,`glassheightmm` ,`framewidthmm` ,`frameheightmm` ,`framestate` ) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, #{state}, #{flip}, #{sequence}, now(), #{position}, #{orderid}, #{listid}, #{boxid}, #{glasswidth}, #{glassheight}, #{framewidthmm}, #{frameheightmm}, 0);")
+  void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm, int sequence, String position, Short state,String orderid, String listid, String boxid, String glasswidth, String glassheight,String framewidthmm,String frameheightmm);
+
+  //鍑虹墖闃熷垪璋冨簭
+  @Update("update out_slice set sequence=#{sequence} where glassid=#{glassId}")
+  void UpdateOutSliceSequence(String glassId,int sequence);
+
+  //鏌ヨ鍑虹墖闃熷垪鏈�澶ч『搴�
+  @Select("select ifnull(max(sequence),0)+1 from out_slice ")
+  Short SelectMaxSquence();
+  //鏌ヨ鐢ㄦ埛鏉冮檺
+  @Select("select rp.* from role_permission rp inner join user r on rp.role_id=r.role_id and r.username=#{username} and (permission_id=32 or permission_id=33 or permission_id=34 or permission_id=35 or permission_id=36 or permission_id=37 or permission_id=38 or permission_id=39)")
+  List<RolePermission> SelectPermissionByUserName(String username);
+
+  // //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
+  // @Update("update out_slice set state=2 where id=#{id}")
+  // void CompleteQueue(String id);
+
+  //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
+  @Update("update out_slice set state=2 where glassid=#{glassid}")
+  void CompleteQueueByGlassId(String glassid);
+
+  //鏌ヨ閾濇id瀵瑰簲鐜荤拑瀹屾垚鏁伴噺
+  @Select("select count(*) from out_slice where barcode=#{frameid} and state!=4")
+  Short SelectCountByFrameNo(String frameid);
+
+  //鍒犻櫎宸插畬鎴愮殑浠诲姟
+  @Delete("delete from out_slice where Barcode=#{frameid}")
+  void CompleteQueueByFrameNo(String frameid);
+
+  //鏌ヨ绗煎唴鏍煎瓙鍓╀綑瀹藉害
+  @Select("Select width from storage_cage where cage=#{cage} and cell=#{cell} limit 1")
+  Double SelectCageWidth(short cage, short cell);
+
+  //淇敼鍑虹墖闃熷垪鐜荤拑鐘舵�佷负缂哄け
+  @Update("update out_slice set state=3 where glassId=#{glassid} and state<3")
+  void UpdateOutSliceGlass(String glassid);
+
+  //鏌ヨ鏈畬鎴愮殑浠诲姟
+  @Select("select * from storage_task where task_state=0 and task_type=#{task_type}")
+  List<StorageTask> SelectTaskByState(int task_type);
+
+  //淇敼鍑虹墖闃熷垪閾濇鐘舵��
+  @Update("update out_slice set framestate=1 where barcode=#{frameno}")
+  void FrameStateUpdate(String frameno);
+
+  //鏌ヨ褰撳墠閾濇淇℃伅
+  @Select("select * from out_slice where framestate=0 order by id limit 1")
+  Out_slice SelectCurrentFrame();
+
+  //鏍规嵁鐜荤拑id鏌ヨ浠诲姟淇℃伅
+  @Select("select task_type from storage_task where glass_id=#{glassid} and task_state!=1")
+  Short SelectTaskByGlassId(String glassid);
+
+  //淇敼鏍煎瓙瀹藉害
+  @Update("update storage_cage set width=width+#{width} where   cage=#{cage} and cell=#{cell};")
+  void UpdataCageWidth(double width, int cage, int cell);
+
+  //鑾峰彇閾濇鏈夋病鏈夋鍦ㄥ嚭鐗囩殑鐜荤拑
+  @Select("select count(*) from out_slice where barcode=#{frameNo} and state=1")
+  Short SelectOutingQueueCount(String frameNo);
+  
 
 }

--
Gitblit v1.8.0