From aa454c63ccc43c454fa2fc020ba9ad17f42d4613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liming=20=E8=94=A1?= <lucky.cailiming@foxmail.com>
Date: Thu, 16 Jul 2026 13:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E8=A6=81=E5=81=9A=E7=9A=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JY.DAL/IDbHelper.cs                         | 2 ++
 JY.Inspection/Frm/FrmHistoricalDataQuery.cs | 4 ++--
 JY.Inspection/Mes/MESDataCombin.cs          | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/JY.DAL/IDbHelper.cs b/JY.DAL/IDbHelper.cs
index 06ef540..c9d00e7 100644
--- a/JY.DAL/IDbHelper.cs
+++ b/JY.DAL/IDbHelper.cs
@@ -43,12 +43,14 @@ namespace JY.DAL
         /// <param name="strDate2">结束时间</param>
         /// <returns></returns>
         List<AlarmData> GetAlarmData(string strDate1, string strDate2);
+
         /// <summary>
         /// 查询进站信息
         /// </summary>
         /// <param name="strCode"></param>
         /// <returns></returns>
         List<FeedingData> GetFeedingData(string strCode);
+
         /// <summary>
         /// 新增产品型号
         /// </summary>
diff --git a/JY.Inspection/Frm/FrmHistoricalDataQuery.cs b/JY.Inspection/Frm/FrmHistoricalDataQuery.cs
index 4da8337..ad7f9bb 100644
--- a/JY.Inspection/Frm/FrmHistoricalDataQuery.cs
+++ b/JY.Inspection/Frm/FrmHistoricalDataQuery.cs
@@ -250,6 +250,7 @@ namespace JY.Inspection.Frm
                 }
                 else//下料
                 {
+                    // TODO 结果数据上传
                     foreach (DataGridViewRow row in dgvData.Rows)
                     {
                         if (Convert.ToBoolean(row.Cells[0].Value))
@@ -260,8 +261,7 @@ namespace JY.Inspection.Frm
                                 return;
                             }
                             else
-                            {
-                               
+                            {                          
                                 JY.MES.FMS.FMS_Out fMS_Out = new MES.FMS.FMS_Out();
                                 //fMS_In.deviceCode = Global.systemConfig.eqp_code;
                                 //fMS_In.houseCode = "test11";
diff --git a/JY.Inspection/Mes/MESDataCombin.cs b/JY.Inspection/Mes/MESDataCombin.cs
index d0c61df..ae35dc0 100644
--- a/JY.Inspection/Mes/MESDataCombin.cs
+++ b/JY.Inspection/Mes/MESDataCombin.cs
@@ -47,6 +47,14 @@ namespace JY.Inspection.Mes
         RespExitStation PostProductExitStationData(ReqExitStation req);
 
         MesCallResult<RespLoginMes> LoginMes(ReqLoginMes req);
+
+        // TODO 上传设备状态信息
+
+        // TODO 上传设备报警信息
+
+        // TODO 能耗
+
+        // TODO 设备打标
     }
 
     public class MESDataCombin : IMes