From 4eb885f2439b4ccdcc101e7a5d555ab6ce35ad78 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 18 十月 2024 12:29:43 +0800
Subject: [PATCH] 技能考核增加事业部字段,工序出站单编辑 增加 班次修改制单,增加人员履历报表
---
WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
index fa7858c..9f288aa 100644
--- a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
+++ b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
@@ -540,10 +540,19 @@
/// <returns></returns>
[Route("Mes_OrderProcFlowAllReportController/GetSc_ProcessErrStationReport_Json")]
[HttpGet]
- public object GetSc_ProcessErrStationReport_Json(string sWhere)
+ public object GetSc_ProcessErrStationReport_Json(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessErrStationReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("exec h_p_Sc_ProcessErrStationReport " + sWhere, "h_p_Sc_ProcessErrStationReport");
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
@@ -571,6 +580,50 @@
}
#endregion
+ #region 杞﹂棿妯″潡 鐢熶骇鏃ラ渶姹傛ā鍏锋姤琛� 鏌ヨ
+ [Route("Mes_OrderProcFlowAllReport/getSc_MouldRequirementDay")]
+ [HttpGet]
+ public object getSc_MouldRequirementDay(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRequirementDay order by 鏃ユ湡 desc", "h_v_Sc_MouldRequirementDay");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRequirementDay where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 ";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRequirementDay");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ 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