From 80db7538bb8e0c475c91cdcb1aab979c88991cda Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 08 七月 2025 09:05:42 +0800
Subject: [PATCH] 小诸葛同步：产品档案更新时不覆盖生产周期
---
WebAPI/Controllers/CJGL/Sc_OEEReportController.cs | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs b/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs
index fa6f551..2ec2e65 100644
--- a/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs
@@ -178,7 +178,6 @@
}
#endregion
-
#region OEE鎶ヨ〃 鏌ヨ鏄庣粏(鐝)
/// <summary>
///鍙傛暟锛歴tring sql銆�
@@ -229,5 +228,45 @@
}
}
#endregion
+
+ #region OEE鎶ヨ〃 鏌ヨ杩愯鏃ュ織
+ [Route("Sc_OEEReport/GetOEERunLogs")]
+ [HttpGet]
+ public object GetOEERunLogs(string sWhere, string user)
+ {
+ try
+ {
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HEquipID = dic["HEquipID"].ToString();//璁惧
+ string HBeginDate = dic["HBeginDate"].ToString();//寮�濮嬫棩鏈�
+ string HEndDate = dic["HEndDate"].ToString();//缁撴潫鏃ユ湡
+
+ ds = oCN.RunProcReturn("exec h_p_SB_OEERunLogs '" + HEquipID.ToString() + "','" + HBeginDate + "','" + HEndDate + "'", "h_p_SB_OEERunLogs");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1