From c85904597bf93e0fbae321093a970dd973b0f64f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 五月 2024 13:54: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 |   76 +++++++++++++++++++++++++++++++------
 1 files changed, 63 insertions(+), 13 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 38b5b3d..f73bc6d 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
@@ -4,6 +4,7 @@
 
 import com.example.springboot.entity.CarPosition;
 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.Out_slice;
@@ -34,6 +35,8 @@
   @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 * from storage_cage where state=#{task_type}")
   List<StorageCage> selectinout(@Param("task_type") Integer task_type);
@@ -55,7 +58,7 @@
   short SelectInTask();
 
   // 鎵嬪姩瀹屾垚浠诲姟
-  @Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0 and glass_id=#{glassid}")
+  @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);
 
   // 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
@@ -71,7 +74,7 @@
   List<StorageCage> SelectCageInfo(String cage);
 
   // 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
-  @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}")
+  @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);
 
   //鏌ヨ灏忚溅浣嶇疆
@@ -85,6 +88,10 @@
   //鏍规嵁鐜荤拑id鏌ヨ鐞嗙墖绗间俊鎭�
   @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}")
@@ -132,12 +139,16 @@
   north_glass_buffer1 SelectBoxNo(String glassid);
 
   //鏌ヨ鍑虹墖闃熷垪淇℃伅
-  @Select("select * from out_slice order by sequence")
+  @Select("select a.*,b.cell from out_slice a left join storage_cage b on a.glassId=b.glass_id 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鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@@ -149,13 +160,13 @@
   List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode);
 
 
-  //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
-  @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1 or state=2 or state=3)")
+  //鏍规嵁鐜荤拑id鏌ヨ鍑虹墖闃熷垪淇℃伅
+  @Select("select * from out_slice where glassid=#{getbarcode}")
   Out_slice SelectQueueByglassid(String getbarcode);
 
   //娣诲姞鍑虹墖闃熷垪
-  @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);
+  @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}")
@@ -165,21 +176,60 @@
   @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)")
+  @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 or permission_id=50)")
   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 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<2")
+  @Select("select count(*) from out_slice where barcode=#{frameid} and state!=4")
   Short SelectCountByFrameNo(String frameid);
 
   //鍒犻櫎宸插畬鎴愮殑浠诲姟
-  @Update("delete from out_slice where Barcode=#{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);
+
+  //鑾峰彇閾濇鏄惁瀛樺湪鐜荤拑瀵逛簡
+  @Select("select count(*) from out_slice where barcode=#{frameNo}")
+  int SelectCountFrame(String getbarcode);
+  
+
 }

--
Gitblit v1.8.0