From dbeba0ce736bc2bd10608905ae77392a90c8cdbb Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Thu, 28 May 2026 13:31:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(pms):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=AF=B9=E8=B1=A1=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E8=AE=BF=E9=97=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 EamObjectInData 类定义，包含设备相关属性字段
- 添加完整的 getter 和 setter 方法用于数据访问
- 新建 EamObjectMapper.xml 配置文件，实现设备数据的增删改查操作
- 添加设备校准记录相关的数据库操作配置
- 添加文件数据查询功能支持
- 添加 MES 类型描述管理功能
- 修复 SysOssDao.xml 中 orderRef6 查询条件错误
---
 .../com/xujie/sys/modules/pms/data/EamObjectInData.java    | 7 +++++++
 src/main/resources/mapper/oss/SysOssDao.xml                | 4 ++++
 src/main/resources/mapper/pms/EamObjectMapper.xml          | 3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
index 6444790e..e5052499 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
@@ -32,6 +32,7 @@ public class EamObjectInData extends EamObjectData {
     private String orderRef3;
     private String orderRef4;
     private String orderRef5;
+    private String orderRef6;
     private String fileType;
     private String searchFlag;
 
@@ -43,6 +44,12 @@ public class EamObjectInData extends EamObjectData {
         this.searchFlag = searchFlag;
     }
 
+    public String getOrderRef6() {return orderRef6;}
+
+    public void setOrderRef6(String orderRef6) {
+        this.orderRef6 = orderRef6;
+    }
+
     public String getOrderRef5() {
         return orderRef5;
     }
diff --git a/src/main/resources/mapper/oss/SysOssDao.xml b/src/main/resources/mapper/oss/SysOssDao.xml
index f1e94cbf..a423b082 100644
--- a/src/main/resources/mapper/oss/SysOssDao.xml
+++ b/src/main/resources/mapper/oss/SysOssDao.xml
@@ -75,6 +75,7 @@
             order_ref2,
             order_ref3,
             order_ref4,
+            order_ref6,
             file_type,
             file_suffix,
             file_type_code,
@@ -93,6 +94,9 @@
             <if test="orderRef4 != '' and orderRef4 != null ">
                 and order_ref4 = #{orderRef4}
             </if>
+            <if test="orderRef6 != '' and orderRef6 != null ">
+                and order_ref4 = #{orderRef6}
+            </if>
             <if test="cAdditionalInfo != '' and cAdditionalInfo != null ">
                 and c_additional_info = #{cAdditionalInfo}
             </if>
diff --git a/src/main/resources/mapper/pms/EamObjectMapper.xml b/src/main/resources/mapper/pms/EamObjectMapper.xml
index cda0ac9b..5b5c010e 100644
--- a/src/main/resources/mapper/pms/EamObjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamObjectMapper.xml
@@ -231,7 +231,8 @@
         so.order_ref2,
         so.order_ref3,
         so.order_ref4,
-        so.order_ref5
+        so.order_ref5,
+        so.order_ref6
         FROM eam_object as eo
         LEFT JOIN sys_oss as so ON eo.site = so.order_ref1 and eo.bu_no = so.order_ref4 and eo.ObjectID = so.order_ref2
         LEFT JOIN eam_location as el ON eo.site = el.site and eo.LocationID = el.LocationID and eo.bu_no = el.bu_no