From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java | 57 ++++-----------------------------------------------------
1 files changed, 4 insertions(+), 53 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 7418618..72b4043 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
@@ -1,10 +1,8 @@
package com.mes.downstorage.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.downglassinfo.entity.DownGlassTask;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -16,55 +14,8 @@
* @author zhoush
* @since 2024-03-27
*/
-@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 left join down_workstation as dw on escd.flow_card_id=dw.flow_card_id WHERE escd.slot IS NOT NULL and dw.workstation_id BETWEEN #{start} and #{end} order by escd.tempering_layout_id,escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectCacheOut(int start,int end);
-//SELECT* from (SELECT DISTINCT escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot left join down_workstation as dw on escd.flow_card_id=dw.flow_card_id WHERE escd.slot IS NOT NULL and dw.workstation_id BETWEEN 1 and 5 order by escd.tempering_layout_id,escd.tempering_feed_sequence) as cc ORDER BY cc.width desc
- // 鏌ヨ绗煎瓙鍐呬俊鎭�
- @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();
+public interface DownStorageCageDetailsMapper extends MPJBaseMapper<DownStorageCageDetails> {
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘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 not null and 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);
-
-
+ DownStorageCageDetails getGlassInfoMaxCount(@Param(value = "workList") List<Integer> workList);
}
--
Gitblit v1.8.0