From 96b63f125687d8ef610745fd9041da2cc77a24af Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 10 四月 2024 08:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
index f8d99d6..5ec7ed8 100644
--- a/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
+++ b/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
@@ -1,18 +1,33 @@
package com.mes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.OrderTest;
+import com.mes.entity.GlassInfo;
import com.mes.entity.Tempering;
+
+import java.util.List;
import org.apache.ibatis.annotations.*;
@Mapper
-public interface OrderTestMapper extends BaseMapper<OrderTest> {
+public interface TemperingMapper extends BaseMapper<Tempering> {
//鏌ヨ璇ョ幓鐠冪殑灏哄鍜屽潗鏍�
-@Select("select*from where id=#{glassId}")
-Tempering SelectTempering(String glassId);
+@Select("select *from glass_info where id=#{glassid};")
+GlassInfo SelectGlass(String glassid);
+//鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
+@Select("select count(*) from glass_info where id=#{glassid};")
+int SelectTempering(String glassid);
+//鏌ヨ绛夊緟涓殑閽㈠寲鐗堝浘鐜荤拑淇℃伅
+@Select("select*from tempering_glass_info a left join (select flowcard_id,count(state)state from tempering_glass_info GROUP BY flowcard_id,state)b on a.flowcard_id=b.flowcard_id where b.state=2")
+List<Tempering> SelectWaitingGlass();
+//鏌ヨ杩涚倝涓殑閽㈠寲鐗堝浘鐜荤拑淇℃伅
+@Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=1)b on a.flowcard_id=b.flowcard_id where b.state1=1")
+List<Tempering> SelectInGlass();
+//鏌ヨ閽㈠寲鍚庣殑閽㈠寲鐗堝浘淇℃伅
+@Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=2)b on a.flowcard_id=b.flowcard_id where b.state1=2")
+List <Tempering> SelectOutGlass();
+
}
--
Gitblit v1.8.0