From 8304fc43850daba13cfbec989e554d720ab62ca4 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 九月 2023 08:15:50 +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 | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 237fe16..aa396cd 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
@@ -51,16 +51,16 @@
short SelectOutTask();
// 鎵嬪姩瀹屾垚浠诲姟
- @Update("update storage_task set task_state=1 where shelf_rack=#{shelf_rack} and task_type=#{task_type} and task_state=0")
- void UpdateTask(@Param("task_type") Integer task_type, @Param("shelf_rack") Integer shelf_rack);
+ @Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0")
+ void UpdateTask(@Param("task_type") Integer task_type);
// 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
- @Update("update storage_cage set state=1 where cell=#{cell} and glass_id=#{glassid} and state=2")
- void UpdateCageTask1(@Param("cell") Integer cell,@Param("glassid") Integer glassid);
+ @Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2")
+ void UpdateCageTask1(@Param("glassid") Integer glassid);
// 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
- @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where cell=#{cell} and glass_id=#{glassid} and state=3")
- void UpdateCageTask2(@Param("cell") Integer cell,@Param("glassid") Integer glassid);
+ @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where glass_id=#{glassid} and state=3")
+ void UpdateCageTask2(@Param("glassid") Integer glassid);
//鑾峰彇鎶ヨ淇℃伅
@Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
@@ -76,4 +76,10 @@
@Select("select * from car_position")
List<CarPosition> Loadcarlist();
+ @Select("select dianqimima from user where id=1")
+ String SelectPassword();
+
+ @Select("select * from storage_cage where glass_id=#{glassid}")
+ StorageCage SelectGlassInfo(Integer glassid);
+
}
--
Gitblit v1.8.0