From a6b6a0fe63555a44682f2e1f9bc65a668c84a7e9 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 23 四月 2024 12:32:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java | 50 +-------------------------------------------------
1 files changed, 1 insertions(+), 49 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
index e5e57bf..5f6b04d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.uppattenusage.entity.GlassInfo;
+import com.mes.glassinfo.entity.GlassInfo;
import org.apache.ibatis.annotations.*;
import java.util.List;
@@ -18,53 +18,5 @@
*/
@Mapper
public interface DownStorageCageDetailsMapper extends BaseMapper<DownStorageCageDetails> {
-//
-// @Select("select * from `glass_info` where id=#{id}")
-// GlassInfo SelectGlassId(String id);
- // 鏌ヨ绗煎瓙鍐呯┖闂�
- @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")
- List<DownStorageCageDetails> SelectCacheLeisure();
-
- // 鏌ヨ绗煎瓙鍐呭嚭鐗囦换鍔�
- @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 NOT NULL order by escd.tempering_layout_id,escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectCacheOut();
-
- // 鏌ヨ绗煎瓙鍐呬俊鎭�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
- List<DownStorageCageDetails> SelectCachInfo();
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @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 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<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence,
- double width);
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @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 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<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, double width);
-
-// // 鏌ヨ鍏ㄩ儴浠诲姟
-// @Select("select * from down_glass_task")
-// List<DownGlassTask> SelectCacheInfoAll();
-//
-// // 鏌ヨ杩涚墖浠诲姟
-// @Select("select * from down_glass_task where task_type='1' and task_stauts='0'")
-// List<DownGlassTask> SelectInputCacheInfo();
-//
-// // 鏌ヨ鍑虹墖浠诲姟
-// @Select("select * from down_glass_task where task_type='2' and task_stauts='0'")
-// List<DownGlassTask> SelectOutCacheInfo();
-
- // 鏌ヨ 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);
-
- // 淇敼绗煎瓙鍐呬俊鎭�
-// @Update("update")
-// Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id);
-
- // 娣诲姞涓嬬墖浠诲姟
- @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);
-
}
--
Gitblit v1.8.0