From b6901c795d8640776818e7d2be6a3396b4a2f535 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 13 九月 2023 14:44:39 +0800
Subject: [PATCH] 增加任务表数据,更改理片笼逻辑
---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 697ba48..1c29c80 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -22,7 +22,7 @@
List<StorageCage> selectAll(Short orderids);
//鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚搴︾┖鏍�
- @Select("select cage,cell,tier,id,ROUND(id/2)as prcId from storage_cage where cage=#{cage1} and state=0 and width>=#{width} ORDER BY cell,tier LIMIT 1")
+ @Select("select cage,cell,tier,id,ROUND(id/2)as prcId from storage_cage where cage=#{cage1} and state=0 and width>=#{width} ORDER BY cell asc,tier desc LIMIT 1")
StorageCage selectCage1(int cage1,double width);
//鍒ゆ柇绗煎瓙鍐呯幓鐠冩暟
@Select("select COUNT(tier)as tier from storage_cage where cage=#{cage} and cell=#{cell} and state=1;")
@@ -54,16 +54,27 @@
StorageCage selectGlassCage(int cage,double width,int cage1,int cage2);
//鍒犻櫎绗煎瓙淇℃伅(鍑虹墖)
- @Update("update storage_cage set state=#{state},width=width+#{width},glass_id=#{glassid},order_id=#{orderid},glasswidth=0 where cage=#{cage} and cell=#{cell} and tier=#{tier};")
+ @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=0 where cage=#{cage} and cell=#{cell} and tier=#{tier};")
void UpdataGlassCage(String orderid,String glassid,double width,int cage,int cell,int tier,int state);
//淇敼绗煎瓙淇℃伅(杩涚墖)
- @Update("update storage_cage set state=#{state},width=width-#{width},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where id=#{id};")
+ @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where id=#{id};")
void UpdataAddCage(Short orderid,Short glassid,double width,int cage,int cell,int id,int state);
+ //淇敼鍚岀瀛愭牸瀛愬搴�
+ @Update("update storage_cage set width=width-#{width} where cage=#{cage} and cell=#{cell};")
+ void UpdataAddCage1(double width,int cage,int cell);
+ //淇敼鍚岀瀛愭牸瀛愬搴�(鍑虹墖)
+ @Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
+ void UpdataOutCage1(double width,int cage,int cell);
//璋冩嫧鏇存崲绗煎瓙淇℃伅
- @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.glasswidth=b.glasswidth,a.width=a.width-b.glasswidth,a.state=1 where a.id=#{id1}")
+ @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.width=a.width-b.glasswidth,a.state=1 where a.id=#{id1}")
void UpdateDBCage(int id1,int cage,int cell);
// @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
// void insert (Spian spian);
-
+ //鏂板浠诲姟琛�
+ @Insert("INSERT INTO `canadames`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`,start_time) VALUES (#{tasktype},#{taskstate},#{shelfrack},#{loadrack},now());")
+ void Inserttask(int tasktype,int taskstate,int shelfrack,int loadrack);
+ //淇敼浠诲姟琛�
+ @Update("update storage_task set task_state=#{state} where task_type=#{type} and task_state=0;")
+ void Updatetask(int state,int type);
}
--
Gitblit v1.8.0