From daed20c553f77fc48695f8523cd57bc56fb5a0fd Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 10 四月 2024 08:35:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
index b83c7ca..beee154 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
@@ -6,7 +6,6 @@
import org.apache.ibatis.annotations.*;
import java.util.List;
-import java.util.Map;
@Mapper
public interface SelectInfo {
@@ -18,13 +17,13 @@
// @Select("select * from `v_optimize_heat_layout` where project_no=#{projeceid} ")
// List<Tempered> SelectTemperedTerritory(String projeceid);
//
- // 鍒囧壊鐗堝浘鎸夊伐绋嬫煡璇�
- @Select("select * from optimize_detail where project_no=#{projeceid} ")
- List<Map> SelectCutTerritory(String projeceid);
-
- // 鏌ヨ纾ㄨ竟淇℃伅
- @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell}")
- List<Map> SelectEdgInfo(String EndCell);
+// // 鍒囧壊鐗堝浘鎸夊伐绋嬫煡璇�
+// @Select("select * from optimize_detail where project_no=#{projeceid} ")
+// List<Map> SelectCutTerritory(String projeceid);
+//
+// // 鏌ヨ纾ㄨ竟淇℃伅
+// @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell}")
+// List<Map> SelectEdgInfo(String EndCell);
// 鏌ヨ绗煎瓙鍐呯┖闂�
@Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot")
@@ -59,7 +58,7 @@
@Select("select * from down_glass_task where task_type='2' and task_stauts='0'")
List<TaskCache> SelectOutCacheInfo();
- // 鏌ヨ A04 鎴� A15 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ // 鏌ヨ A06 鎴� A11 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
@Select("select * from down_glass_task where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1")
GlassInfo SelectLastOutCacheInfo(String EndCell);
@@ -71,13 +70,5 @@
@Insert("INSERT into down_glass_task VALUES(#{id},#{start},#{end},#{type},0,)")
Integer insertCacheTask(String id, String start, String end, String type,double width,double height,Integer filmsId,double thickness,String flowCardId);
- //
- // @Insert("INSERT `order`(order_id)VALUES(#{order_id})")
- // Integer insert(Order order);
- //
- // @Delete("delete from `order` where id=#{id}")
- // Integer deleteById(@Param("id") Integer id);
- //
- // @Update("update `order` set order_id=#{order_id} where id=#{id}")
- // Integer update(@Param("id") Integer id,@Param("order_id") String order_id);
+
}
--
Gitblit v1.8.0