添加查询所有玻璃数据

huang

6 小时以前 8ec0064cd95292f14027006a8be47c1a71f69af9

 mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGlassInfoMapper.java

@@ -51,5 +51,52 @@
     */
    @Select("SELECT * FROM glass_info WHERE engineering_id = #{engineeringId} AND is_deleted = 0")
    List<GlassInfo> selectByEngineeringId(@Param("engineeringId") String engineeringId);

    /**
     * 根据玻璃ID查询玻璃信息（包括逻辑删除的记录）
     * 
     * @param glassId 玻璃ID
     * @return 玻璃信息
     */
    @Select("SELECT * FROM glass_info WHERE glass_id = #{glassId} LIMIT 1")
    GlassInfo selectByGlassIdIncludingDeleted(@Param("glassId") String glassId);

    /**
     * 恢复逻辑删除的记录并更新字段（绕过逻辑删除拦截器）
     * 
     * @param id 记录ID
     * @param glassId 玻璃ID
     * @param glassLength 玻璃长度
     * @param glassWidth 玻璃宽度
     * @param glassThickness 玻璃厚度
     * @param status 状态
     * @param state 状态值
     * @param engineeringId 工程号
     * @param updatedTime 更新时间
     * @param updatedBy 更新人
     * @return 更新行数
     */
    @org.apache.ibatis.annotations.Update("UPDATE glass_info SET " +
            "is_deleted = 0, " +
            "glass_id = #{glassId}, " +
            "glass_length = #{glassLength}, " +
            "glass_width = #{glassWidth}, " +
            "glass_thickness = #{glassThickness}, " +
            "status = #{status}, " +
            "state = #{state}, " +
            "engineering_id = #{engineeringId}, " +
            "updated_time = #{updatedTime}, " +
            "updated_by = #{updatedBy} " +
            "WHERE id = #{id}")
    int restoreAndUpdateById(@Param("id") Long id,
                             @Param("glassId") String glassId,
                             @Param("glassLength") Integer glassLength,
                             @Param("glassWidth") Integer glassWidth,
                             @Param("glassThickness") java.math.BigDecimal glassThickness,
                             @Param("status") String status,
                             @Param("state") Integer state,
                             @Param("engineeringId") String engineeringId,
                             @Param("updatedTime") java.util.Date updatedTime,
                             @Param("updatedBy") String updatedBy);
}