From ef47083c90ff7e70362a32741a0a4d5770037e7f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 三月 2024 10:44:04 +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/HomeMapper.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 be93c8b..66857b4 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
@@ -3,7 +3,7 @@
import org.apache.ibatis.annotations.*;
import com.example.springboot.entity.CarPosition;
-import com.example.springboot.entity.Flowcard;
+import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
@@ -269,7 +269,7 @@
void StorageCageAddGlass(String cell, GlassInfo glassInfo);
@Select("select * from flowcard where state!=2")
- List<Flowcard> SelectOrderTask();
+ List<FlowCard> SelectOrderTask();
@Select("select * from glassinfo where flowcard=#{flowcard} order by mateid,tier")
List<GlassInfo> SelectOrderView(String flowcard);
@@ -280,8 +280,11 @@
@Update("update flowcard set method=#{method} where flowcard=#{flowcard}")
void ModeChange(String flowcard, int method);
- @Select("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype} where state=0")
+ @Update("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype} where state=0")
void UpdateQueue(String flowcard,double width,double height,Integer glasstype);
+
+ @Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{geTier}")
+ void AddGlassNo(Integer flowcard, Integer mateid, Integer geTier);
}
--
Gitblit v1.8.0