From c3204d686fbf8a64dd7fa4dcbb48c0a075df06e0 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期二, 05 十二月 2023 08:06:19 +0800 Subject: [PATCH] 更新电气管理界面 --- springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 90 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 69 insertions(+), 21 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 51ed198..1889fad 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,9 +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; @@ -32,7 +34,7 @@ List<StorageCage> selectRack4(); // 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝e湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅 - @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type} limit 1") + @Select("select * from storage_cage where state=#{task_type}") List<StorageCage> selectinout(@Param("task_type") Integer task_type); // 鏌ヨ鏄惁瀛樺湪姝よ鍗� @@ -68,10 +70,10 @@ List<alarmmg> SelectAlarmmgInfo(); //鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅 - @Select("select *,concat(round(a.glasswidth*b.Conversionrate,2),' x ',round(a.glassheight*b.Conversionrate,2)) as lengthwidth from storage_cage as a,glass as b ") - 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); //鏌ヨ灏忚溅浣嶇疆 @@ -88,36 +90,82 @@ //鏌ヨ鐜荤拑淇℃伅 // @Select("select * from glass where glassid=#{glassid}") - @Select("SELECT id,glassid,orderid,\n" + - " ROUND(width * Conversionrate, 2) AS width,\n" + - " ROUND(height * Conversionrate, 2) AS height\n" + - "FROM glass\n" + - "where glassid=#{glassid};") - Glass SelectGlassByGlassID(String glassid); + @Select("SELECT ordernumber,listnumber,boxnumber,barcode,glasslength,glassheight,glasslength_mm,glassheight_mm FROM north_glass_buffer1 where barcode=#{barcode}") + north_glass_buffer1 SelectGlassByGlassID(String barcode); //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛� @Update("update storage_cage set disabled=#{disabled} where cage=#{cage} and cell=#{cell}") void Disabled(short cage, short cell, short disabled); //鐞嗙墖绗兼柊澧炵幓鐠� - @Update("update storage_cage set state=1,glass_id=#{glass.glassId},order_id=#{glass.orderId},glasswidth=#{glass.width},glassheight=#{glass.height} where cage=#{cage} and cell=#{cell} and tier=#{tier}") - void Inglassid(Glass 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}") short SelectStorageByGlassId(String glassId); + //鏍规嵁璁㈠崟鏌ヨ鐜荤拑淇℃伅 - @Select("select * from glass where position(#{orderid} in orderid)") - List<Glass> SelectGlass(String orderid); + @Select("select * from north_glass_buffer1 where position(#{orderid} in ordernumber)") + List<north_glass_buffer1> SelectGlass(String orderid); + //鑾峰彇涓婄墖闃熷垪淇℃伅 - @Select("select gl.* from queue qe inner join glass gl on qe.glassid=gl.glassid where qe.id=#{id}") - Glass GetQueueInfo(int id); + @Select("select * from queue where id=#{id}") + Queue GetQueueInfo(int id); + //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠� - @Select("update queue set glassid=#{glassid},state=0 where id=1") - void InsertQueueGlassId(String glassid); - //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠� + @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") void UpdateQueueState(); - + //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠� + @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); + + //鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟 + @Select("select count(*) from storage_cage where order_id=#{orderid}") + Short SelectGlassNo(String orderid); + + //鏍规嵁鐜荤拑id浠庡鎴疯〃鏌ヨ鏁版嵁 + @Select("select * from north_glass_buffer1 where barcode=#{glassid}") + north_glass_buffer1 SelectBoxNo(String glassid); + + //鏌ヨ鍑虹墖闃熷垪淇℃伅 + @Select("select * from out_slice where state=0 or state=1 or state=2 order by sequence") + List<Out_slice> SelectProductionqueue(); + + //鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅 + @Select("select * from storage_cage where glass_id=#{glassid}") + StorageCage SelectStorageGlassById(String glassid); + + + //鏍规嵁鐜荤拑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}") + List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode); + + + //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪 + @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`, `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(); + + } -- Gitblit v1.8.0