From 8ec0064cd95292f14027006a8be47c1a71f69af9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 31 十二月 2025 17:02:57 +0800
Subject: [PATCH] 添加查询所有玻璃数据

---
 mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGlassInfoMapper.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGlassInfoMapper.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGlassInfoMapper.java
index ad8dd1c..9399ef2 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGlassInfoMapper.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/mapper/DeviceGlassInfoMapper.java
@@ -42,5 +42,61 @@
      */
     @Select("SELECT * FROM glass_info WHERE status = #{status} AND is_deleted = 0 ORDER BY created_time DESC")
     List<GlassInfo> selectByStatus(@Param("status") String status);
+
+    /**
+     * 鏍规嵁宸ョ▼鍙锋煡璇㈢幓鐠僆D鍒楄〃
+     * 
+     * @param engineeringId 宸ョ▼鍙�
+     * @return 鐜荤拑淇℃伅鍒楄〃
+     */
+    @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);
 }
 

--
Gitblit v1.8.0