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 --- UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java | 84 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 3 deletions(-) diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java index c48a549..3d00318 100644 --- a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java +++ b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java @@ -1,16 +1,94 @@ package com.mes.mapper; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mes.entity.DownGlassInfo; import com.mes.entity.DownWorkstation; -import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.*; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + @Mapper +@Component @Repository @InterceptorIgnore(tenantLine = "true") -@DS("hangzhoumes") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧� public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> { +//鏍规嵁宸ヤ綅ID鍜岃澶嘔D鏇存柊宸ヤ綅鐘舵�� + @Update("UPDATE down_workstation SET work_state = #{workState} " + + "WHERE workstation_id = #{workstationId} AND device_id = #{deviceId}") + void updateWorkStateByWorkstationIdAndDeviceId(@Param("workstationId") Integer workstationId, + @Param("deviceId") Integer deviceId, + @Param("workState") Integer workState); +//宸ヤ綅ID鍒犻櫎淇℃伅 + @Delete("DELETE FROM down_workstation WHERE workstation_id = #{workstationId}") + void deleteByWorkstationId(@Param("workstationId") Integer workstationId); + +//钀芥灦 + @Insert("INSERT INTO down_workstation (workstation_id, flow_card_id, device_id, enable_state, work_state) " + + "VALUES (#{workstationId}, #{flowCardId}, #{deviceId}, #{enableState}, #{workState})") + void insertDownWorkstation(DownWorkstation downWorkstation); + +//鏍规嵁璁惧ID鏌ヨ宸ヤ綅淇℃伅 + @Select("SELECT * FROM down_workstation WHERE device_id = #{deviceId}") + List<DownWorkstation> selectByDeviceId(@Param("deviceId") Integer deviceId); +//浠庢満姊版墜浠诲姟琛ㄦ煡璇㈢姸鎬佷负1鐨勬祦绋嬪崱鍙� +// @Select("SELECT * FROM down_workstation_task WHERE state = 1") +// List<DownWorkstation> selectdownWorkstationstate(); +//鏌ヨ宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负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(); +//鏇存柊钀芥灦鏁伴噺 + @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); + +//鏍规嵁宸ヤ綅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 = 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); + + +@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 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); + + // 鑾峰彇鎬绘暟閲� + @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); } -- Gitblit v1.8.0