From ef70db354165ae7d5e79f44da820c063df71e423 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 06 九月 2023 17:10:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 8 ++++++--
1 files changed, 6 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 85d809a..c0ce979 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
@@ -28,7 +28,7 @@
List<StorageCage> selectRack4();
// 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
- @Select("select * from storage_cage where state=#{task_type} limit 1")
+ @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type} limit 1")
List<StorageCage> selectinout(@Param("task_type") Integer task_type);
// 鏌ヨ鏄惁瀛樺湪姝よ鍗�
@@ -36,7 +36,7 @@
short SelectOrder(@Param("orderid") String orderid);
// @Insert("insert into order_out(orderid) values('#{orderid}')")
- @Insert("INSERT INTO `canadames`.`order_out`( `order_id`,`mod_time`) VALUES ( #{orderid},now())")
+ @Insert("INSERT INTO `canadames`.`order_out`( `orderid`,`mod_time`) VALUES ( #{orderid},now())")
void InsertOrder(String orderid);
//鍋滄鎸夊綋鍓嶈鍗曞嚭鐗�
@@ -46,4 +46,8 @@
//鏌ヨ鏄惁瀛樺湪姝ｅ湪涓婄墖鐨勪换鍔�
@Select("select count(*) from storage_task where task_state=0 and task_type=1")
short SelectOutTask();
+
+ //鎵嬪姩瀹屾垚浠诲姟
+ @Select("update storage_task set state=1 where shelf_rack=#{shelf_rack} and task_type=#{task_type} and task_state=0")
+ short SelectOutTask(@Param("task_type") Integer task_type,@Param("shelf_rack") Integer shelf_rack);
}
--
Gitblit v1.8.0