From d4f7212718f775586ffba74960d78dca5ee4aad2 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 19 九月 2024 09:03:37 +0800
Subject: [PATCH] 1.工艺参数点检:增加附件上传功能 2.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入)) 3.开工:增加设备启动点检,防错验证控制 .设备/模具:保养规程 表头增加 HErrWarDays int --预警天数 2.设备/模具:保养计划单增加HErrBeginTime datetime --预警开始时间点,审核时把子表 预警开始时间点, 填入 3.设备启动点检清单/启动点检清单:增加字段HDotCheckType varchar(50) --点检类型(设备,模具,作业指导书,检验指导书) HRelationID int --关联ID(设备内码或模具内码)
---
WebAPI/Controllers/MateOutController.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 323e28d..49f11f2 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -2932,6 +2932,55 @@
}
}
#endregion
+
+ #region 閿�鍞鍗曟潯鐮佸嚭鍏ュ簱璇︽儏
+ [Route("MaterOutEntryReport/Xs_SeOrderBarCodeInAndOutStockDetailReport")]
+ [HttpGet]
+ public object Xs_SeOrderBarCodeInAndOutStockDetailReport(string sWhere, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBarCodeInAndOutStockDetailReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from h_v_Xs_SeOrderBarCodeInAndOutStockDetailReport_Query where 1=1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Xs_SeOrderBarCodeInAndOutStockDetailReport_Query");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
}
--
Gitblit v1.9.1