From 12c065f48d6a4f5b1489da95f2091edb9a831196 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 十二月 2023 13:07:57 +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 | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 5eb7b2a..4d38b21 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;
@@ -139,6 +140,10 @@
@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鍒犻櫎鍑虹墖闃熷垪鐜荤拑
// @Update("update out_slice set state=4 where barcode=#{FrameNo} and (state=0 or state=1 or state=2)")
@@ -172,7 +177,7 @@
void CompleteQueue(String id);
//鏌ヨ閾濇id瀵瑰簲鐜荤拑瀹屾垚鏁伴噺
- @Select("select count(*) from out_slice where barcode=#{frameid} and state<2")
+ @Select("select count(*) from out_slice where barcode=#{frameid} and (state=0 or state=1 or state=3)")
Short SelectCountByFrameNo(String frameid);
//鍒犻櫎宸插畬鎴愮殑浠诲姟
@@ -182,7 +187,10 @@
@Select("Select width from storage_cage where cage=#{cage} and cell=#{cell} limit 1")
Double SelectCageWidth(short cage, short cell);
- @Select("update out_slice set state=3 where glassId=#{glassid}")
+ @Select("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);
+
}
--
Gitblit v1.8.0