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
---
CacheGlassModule/src/main/java/com/mes/mapper/HangzhouMesMapper.java | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java b/CacheGlassModule/src/main/java/com/mes/mapper/HangzhouMesMapper.java
similarity index 69%
rename from CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
rename to CacheGlassModule/src/main/java/com/mes/mapper/HangzhouMesMapper.java
index e8bcfe2..4c4b87a 100644
--- a/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
+++ b/CacheGlassModule/src/main/java/com/mes/mapper/HangzhouMesMapper.java
@@ -1,5 +1,6 @@
package com.mes.mapper;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.mes.entity.EdgStorageCageDetails;
import com.mes.entity.GlassInfo;
import com.mes.entity.TaskCache;
@@ -10,64 +11,56 @@
import org.apache.ibatis.annotations.*;
+@DS("hangzhoumes")
@Mapper
-public interface SelectInfo {
+public interface HangzhouMesMapper {
+
// 鐜荤拑淇℃伅 鎸塈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> SelectTemperedTerritory(String projeceid);
-
- // 鍒囧壊鐗堝浘鎸夊伐绋嬫煡璇�
- @Select("select * from optimize_detail where project_no=#{projeceid} ")
- List<Map> SelectCutTerritory(String projeceid);
-
+ GlassInfo selectGlassId(String id);
// 鏌ヨ纾ㄨ竟淇℃伅
@Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell}")
- List<Map> SelectEdgInfo(String 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();
+ 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();
+ 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 esc.*,escd.id as detailsID,escd.device_id as details_device_id,escd.glass_id,escd.sequence,escd.flow_card_id,escd.glass_type,escd.width,escd.height,escd.thickness,escd.edg_width,escd.edg_height,escd.tempering_layout_id,escd.tempering_feed_sequence,escd.pattern_sequence,escd.state,escd.gap from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
+ List<Map> 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);
+ 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);
+ List<EdgStorageCageDetails> selectIsExistIntoCache(Integer tempering_layout_id, double width);
// 鏌ヨ鍏ㄩ儴浠诲姟
@Select("select * from task_cache")
- List<TaskCache> SelectCacheInfoAll();
+ List<TaskCache> selectCacheInfoAll();
// 鏌ヨ杩涚墖浠诲姟
@Select("select * from task_cache where task_type='1' and task_stauts='0'")
- List<TaskCache> SelectInputCacheInfo();
+ List<TaskCache> selectInputCacheInfo();
// 鏌ヨ鍑虹墖浠诲姟
@Select("select * from task_cache where task_type='2' and task_stauts='0'")
- List<TaskCache> SelectOutCacheInfo();
+ 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);
+ GlassInfo selectLastOutCacheInfo(String EndCell);
// 淇敼绗煎瓙鍐呬俊鎭�
@Update("update")
- Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id);
+ Integer updateCache(@Param("id") Integer id, @Param("order_id") String order_id);
// 娣诲姞鐞嗙墖浠诲姟
@Insert("INSERT into task_cache VALUES(#{id},#{start},#{end},#{type},0)")
--
Gitblit v1.8.0