From e208aa1ef8e861dba168e8d83ab3066fc9f1e02d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 16 四月 2024 13:30:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
index 0ebb1bd..8607c8d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downworkstation.entity.DownWorkstation;
import org.apache.ibatis.annotations.*;
-import org.springframework.stereotype.Component;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -21,64 +21,63 @@
* @since 2024-03-27
*/
@Mapper
+
@Repository
@InterceptorIgnore(tenantLine = "true")
@DS("hangzhoumes") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧�
+
public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> {
//鏌ヨ宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
@Select("SELECT dwt.flow_card_id,dw.id,dw.racks_number FROM down_workstation_task dwt JOIN down_workstation dw ON dwt.flow_card_id = dw.flow_card_id WHERE dwt.state = 1 LIMIT 1")
List<DownWorkstation> selectdownWorkstationstate();
+
+
+// @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE task_stauts = 1;")
+// List<DownGlassTask> selectunloadingtaskstate();
//鏇存柊钀芥灦鏁伴噺
- @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " +
- "WHERE flow_card_id = #{flowCardId}")
- void update_racks_number(@Param("flowCardId") String flowCardId,
- @Param("racksNumber") Integer racksNumber);
+// @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " +
+// "WHERE flow_card_id = #{flowCardId}")
+// void update_racks_number(@Param("flowCardId") String flowCardId,
+// @Param("racksNumber") Integer racksNumber);
//鎻掑叆鏈烘浠诲姟琛�
- @Insert("INSERT INTO down_workstation_task (flow_card_id, width, height, thickness, filmsid,state) " +
- "VALUES (#{flowCardId}, #{width}, #{height}, #{thickness}, #{filmsid},1)")
- void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
+// @Insert("INSERT INTO down_workstation_task (flow_card_id, width, height, thickness, filmsid,state) " +
+// "VALUES (#{flowCardId}, #{width}, #{height}, #{thickness}, #{filmsid},1)")
+// void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
//鏍规嵁宸ヤ綅id鏇存柊瀹炰綋绫绘帴鏀剁殑鏁版嵁
- @Update("UPDATE down_workstation SET width = #{width}, height = #{height}, flow_card_id = #{flowCardId} WHERE workstation_id = #{workstationId}")
- void updateFlowCardId(DownWorkstation downWorkstation);
+// @Update("UPDATE down_workstation SET width = #{width}, height = #{height}, flow_card_id = #{flowCardId} WHERE workstation_id = #{workstationId}")
+// void updateFlowCardId(DownWorkstation downWorkstation);
- //婊℃灦鎷夎蛋锛屾竻绌轰俊鎭�
- @Update("UPDATE down_workstation SET width = null, height = null, flow_card_id = null WHERE workstation_id = #{workstationId}")
- void clearFlowCardId(DownWorkstation downWorkstation);
- @Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
- void update_task_state_to_zero(@Param("flowCardId") String flowCardId);
+// @Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
+// void update_task_state_to_zero(@Param("flowCardId") String flowCardId);
- @Select(" SELECT * FROM down_workstation WHERE workstation_id >= 1 AND workstation_id <= 5")
- List<DownWorkstation> getoneDownWorkstations();
-
-
- @Select(" SELECT * FROM down_workstation WHERE workstation_id >= 6 AND workstation_id <= 10")
- List<DownWorkstation> gettwoDownWorkstations();
+// @Select("SELECT * FROM down_workstation WHERE workstation_id BETWEEN #{startId} AND #{endId}")
+// List<DownWorkstation> getDownWorkstationsInRange(@Param("startId") int startId, @Param("endId") int endId);
- @Select("SELECT DISTINCT flowcard_id from glass_info")
- @ResultType(Map.class)
- List<Map<String, Object>> getflowCardId();
+// @Select("SELECT DISTINCT flowcard_id from glass_info")
+// @ResultType(Map.class)
+// List<Map<String, Object>> getflowCardId();
- @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = 0, racks_number = 0 WHERE workstation_id = #{workstationId}")
- void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId);
+// @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = 0, racks_number = 0 WHERE workstation_id = #{workstationId}")
+// void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId);
// 鑾峰彇鎬绘暟閲�
- @Select("SELECT total_quantity FROM down_workstation WHERE workstation_id = #{workstationId}")
- int getTotalQuantity(@Param("workstationId") int workstationId);
+// @Select("SELECT total_quantity FROM down_workstation WHERE workstation_id = #{workstationId}")
+// int getTotalQuantity(@Param("workstationId") int workstationId);
// 鑾峰彇钀芥灦鏁伴噺
- @Select("SELECT racks_number FROM down_workstation WHERE workstation_id = #{workstationId}")
- int getRacksNumber(@Param("workstationId") int workstationId);
+// @Select("SELECT racks_number FROM down_workstation WHERE workstation_id = #{workstationId}")
+// int getRacksNumber(@Param("workstationId") int workstationId);
}
--
Gitblit v1.8.0