From a5ba96bea69ffca37f985c9503c654bf79cf9ef8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 16:57:37 +0800
Subject: [PATCH] 完善主界面，添加笼子表分页与根据玻璃id查询
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 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 8eee477..61db9ec 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,11 +3,11 @@
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.Out_slice;
+import com.example.springboot.entity.Queue;
import java.util.List;
@@ -34,7 +34,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);
// 鏌ヨ鏄惁瀛樺湪姝よ鍗�
@@ -70,8 +70,8 @@
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}")
void DeleteByGlassID(String glassid);
@@ -98,8 +98,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}")
@@ -110,12 +110,12 @@
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);
+ @Select("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")
@@ -134,7 +134,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 order by sequence")
List<Out_slice> SelectProductionqueue();
//鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
@@ -150,20 +150,18 @@
@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)")
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("update out_slice set sequence=#{sequence} where glassid=#{glassId}")
+ void UpdateOutSliceSequence(String glassId,int sequence);
+
+
}
--
Gitblit v1.8.0