From de6afc2ec06724885de7cc0eb8b8cad61f8c0b3b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 07 十二月 2023 08:32:41 +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 | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 8e7b10a..3dfec02 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
@@ -8,6 +8,7 @@
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
+import com.example.springboot.entity.RolePermission;
import java.util.List;
@@ -70,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);
//鏌ヨ灏忚溅浣嶇疆
@@ -122,7 +123,7 @@
void UpdateQueueState();
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
- @Select("update queue set glassid='',state=0 where id=#{id}")
+ @Select("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);
//鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
@@ -134,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 where state=0 or state=1 or state=2 order by sequence")
List<Out_slice> SelectProductionqueue();
//鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
@@ -143,8 +144,8 @@
//鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
- @Select("update out_slice set state=3 where id=#{id}")
- void DeleteProductionQueueGlass(Short id);
+ @Select("update out_slice set state=3 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}")
@@ -152,12 +153,22 @@
//鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
- @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)")
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);
+ @Select("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip}, #{sequence}, now(), #{position});")
+ void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm, int sequence, String position);
+ //鍑虹墖闃熷垪璋冨簭
+ @Select("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 role r on rp.role_id=r.id and r.name=#{token} and (permission_id=32 or permission_id=33 or permission_id=34 or permission_id=35)")
+ List<RolePermission> SelectPermissionByUserName(String token);
}
--
Gitblit v1.8.0