From 1de52d82ec5c3fb56e095a36571ab32bfdb15ca4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 31 三月 2024 13:25:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
index 1522f15..0a746cf 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
@@ -1,4 +1,5 @@
package com.example.springboot.mapper;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@@ -11,11 +12,11 @@
@Repository
public interface AlbaniaMapper {
//鍒ゆ柇绗煎唴鏄惁鏈夊悎閫傜殑绫诲瀷绌烘牸
- @Select("select id from storage_cage where glasstype=#{glasstype} and width>=#{width}+#{widths} and state=0 order by id limit 1")
- int SelectCage(int glasstype,Double width,int widths);
+ @Select("select id from storage_cage where glasstype=#{glasstype} and width>=#{width}+#{widths} and state=0 and disabled=0 order by id limit 1")
+ StorageCage SelectCage(int glasstype,Double width,int widths);
//鍒ゆ柇绗煎唴娌℃湁鐜荤拑鐨勭┖鏍�
- @Select("select id from storage_cage where number=0 and cage>#{cage} and cage<#{cage2} order by id limit 1")
- int SelectNewCell(int cage,int cage2);
+ @Select("select id from storage_cage where number=0 and cage>#{cage} and cage<#{cage2} and disabled=0 order by id limit 1")
+ StorageCage SelectNewCell(int cage,int cage2);
//澧炲姞鐜荤拑鏁�
@Update("update storage_cage set number=number+1,width=width-glasswidth where id=#{id}")
void UpdateCageNumberAdd(int id);
@@ -27,9 +28,9 @@
void Inserttask(int tasktype, int taskstate, int shelfrack, int loadrack, String glassid, int glasstype,String flowcard,int mateid,int tier);
//鏂板涓�鏉＄瀛愭暟鎹�
@Update("UPDATE `albania`.`storage_cage` SET `glass_id` =#{glassid}, `width` =width-#{glasswidth}, `glasswidth` =#{glasswidth}, `glassheight` =#{glassheight}, `glasswidthmm` =#{glasswidthmm}, `glassheightmm` = #{glassheightmm}, `state` = #{state}, `glasstype` = #{glasstype}, `number` = #{number} WHERE `id` =#{id};")
- void AddCage(int id,String glassid,Double glasswidth,Double glassheight,Double glasswidthmm,Double glassheightmm,int state,int glasstype,int number);
+ void AddCage(int id,String glassid,Double glasswidth,Double glassheight,Double glasswidthmm,Double glassheightmm,int state,String glasstype,int number);
//鑾峰彇杩涚墖鏁版嵁
- @Select("select glassid,flowcard,glasswidth as width,glassheight as height,glasswidthmm,glassheightmm,glasstype from queue where state=1 limit 1")
+ @Select("select glassid,flowcard,glasswidth as width,glassheight as height,glasswidthmm,glassheightmm,glasstype,thickness from queue where state=1 limit 1")
GlassInfo SelectGlass();
//涓�鍙风嚎鏌ヨ浠诲姟
@Select("select * from v_cagerelease1 where mateid not in(select mateid from v_cagerelease1 where surplus=0 group by mateid);")
@@ -46,6 +47,19 @@
//鍙戦�佸嚭鐗囧悗澧炲姞宸插彂鏁伴噺
@Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{tier};")
void AddFinishNumber(String flowcard,int mateid,int tier);
-
+ //鑾峰彇褰撳墠浠诲姟鐨刬d
+ @Select("select id from storage_task where task_state=0 and glass_id=#{glassid} LIMIT 1")
+ GlassInfo SelectTaskId(String glassid);
+ //鍒犻櫎娴嬮噺琛ㄧ殑淇℃伅
+ @Delete("delete from queue where glassid=#{glassid}")
+ int DeleteQueue(String glassid);
+ //鍒ゆ柇鏄惁鏄洿鍑烘ā寮�
+ @Select("select method from flowcard where state=1 and line=#{line} ORDER BY starttime LIMIT 1;")
+ GlassInfo SelectMethod(int line);
+ //鐩村嚭妯″紡浠诲姟鏌ヨ
+ @Select("select b.flowcard,b.glasstype,b.mateid,a.totaltier as id from flowcard a left join glassinfo b on a.flowcard=b.flowcard where a.line=#{line}")
+ GlassInfo SelectOutGlass2(int line);
+
+
}
--
Gitblit v1.8.0