From c3ddb3eb7e7835d93e7a2751986af59c4690c5db Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 01 四月 2024 08:41:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 14 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java b/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
index 2b65272..e8bcfe2 100644
--- a/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
+++ b/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
@@ -1,30 +1,85 @@
package com.mes.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.entity.EdgStorageCageDetails;
import com.mes.entity.GlassInfo;
-import com.mes.entity.OrderTest;
+import com.mes.entity.TaskCache;
import com.mes.entity.Tempered;
import java.util.List;
+import java.util.Map;
import org.apache.ibatis.annotations.*;
@Mapper
public interface SelectInfo {
- //鐜荤拑淇℃伅 鎸塈D鏌ヨ
+ // 鐜荤拑淇℃伅 鎸塈D鏌ヨ
@Select("select * from `glass_info` where id=#{id}")
GlassInfo SelectGlassId(String id);
- //閽㈠寲鎸夊伐绋嬫煡璇�
+ // 閽㈠寲鎸夊伐绋嬫煡璇�
@Select("select * from `v_optimize_heat_layout` where project_no=#{projeceid} ")
- List<Tempered> SelectTempered(String projeceid);
-//
-// @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);
+ 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 escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot")
+ List<EdgStorageCageDetails> SelectCacheLeisure();
+
+ // 鏌ヨ绗煎瓙鍐呭嚭鐗囦换鍔�
+ @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot WHERE escd.slot IS NOT NULL order by escd.tempering_layout_id,escd.tempering_feed_sequence")
+ List<EdgStorageCageDetails> SelectCacheOut();
+
+ // 鏌ヨ绗煎瓙鍐呬俊鎭�
+ @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
+ List<EdgStorageCageDetails> SelectCachInfo();
+
+ // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
+ @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence")
+ List<EdgStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence,
+ double width);
+
+ // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
+ @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id<#{tempering_layout_id} and esc.remain_width-#{width}>0 order by escd.tempering_layout_id desc,escd.tempering_feed_sequence")
+ List<EdgStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, double width);
+
+ // 鏌ヨ鍏ㄩ儴浠诲姟
+ @Select("select * from task_cache")
+ List<TaskCache> SelectCacheInfoAll();
+
+ // 鏌ヨ杩涚墖浠诲姟
+ @Select("select * from task_cache where task_type='1' and task_stauts='0'")
+ List<TaskCache> SelectInputCacheInfo();
+
+ // 鏌ヨ鍑虹墖浠诲姟
+ @Select("select * from task_cache where task_type='2' and task_stauts='0'")
+ List<TaskCache> SelectOutCacheInfo();
+
+ // 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1")
+ GlassInfo SelectLastOutCacheInfo(String EndCell);
+
+ // 淇敼绗煎瓙鍐呬俊鎭�
+ @Update("update")
+ Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id);
+
+ // 娣诲姞鐞嗙墖浠诲姟
+ @Insert("INSERT into task_cache VALUES(#{id},#{start},#{end},#{type},0)")
+ Integer insertCacheTask(String id, String start, String end, String type);
+
+ //
+ // @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