Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-03-31 38e2fda87c28fa7128d971e7afac1b05a06872d6

 UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java

@@ -3,6 +3,7 @@
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.*;

import org.springframework.stereotype.Component;

@@ -34,8 +35,22 @@
//根据设备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();



    @Select("SELECT dw.flow_card_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);