From 54c7981d6f05ce0e3b59df3c4e23cd06a81a059b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 09:15:01 +0800
Subject: [PATCH] 后端代码改为大部分使用消息处理对象写入

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java |   80 ++++++++++++++++++++++++---------------
 1 files changed, 49 insertions(+), 31 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..512c562 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,12 @@
 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.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;
 
@@ -35,7 +35,7 @@
   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,8 +55,8 @@
   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 task_state=0 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")
@@ -71,10 +71,10 @@
   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 where glass_id=#{glassid}")
   void DeleteByGlassID(String glassid);
 
   //鏌ヨ灏忚溅浣嶇疆
@@ -99,8 +99,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 +111,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,7 +135,7 @@
   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鏌ヨ绗煎唴鐜荤拑淇℃伅
@@ -143,28 +143,46 @@
   StorageCage SelectStorageGlassById(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)")
+  @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1 or state=2 or state=3)")
   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`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, #{state}, #{flip}, #{sequence}, now(), #{position});")
+  void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm, int sequence, String position, Short state);
+
+  //鍑虹墖闃熷垪璋冨簭
+  @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)")
+  List<RolePermission> SelectPermissionByUserName(String username);
+  //瀹屾垚鍑虹墖浠诲姟
+  @Update("update out_slice set state=2 where id=#{id}")
+  void CompleteQueue(String id);
+
+  //鏌ヨ閾濇id瀵瑰簲鐜荤拑瀹屾垚鏁伴噺
+  @Select("select count(*) from out_slice where barcode=#{frameid} and state<2")
+  Short SelectCountByFrameNo(String frameid);
+
+  //鍒犻櫎宸插畬鎴愮殑浠诲姟
+  @Update("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);
 
 }

--
Gitblit v1.8.0