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/WebAPIController.cs | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 618f380..12a31a5 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -11330,10 +11330,44 @@
return objjson; ;
}
}
-
-
-
#endregion
+
+ /// <summary>
+ /// 鑾峰彇鍩烘湰淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/BaseInfo")]
+ [HttpGet]
+ public object GetBaseInfo()
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from xt_BaseInfo", "xt_BaseInfo");
+ if (ds is null)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }catch(Exception e)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.Message;
+ objjson.data = null;
+ return objjson;
+ }
+ }
/// <summary>
/// 鑾峰彇鑱屽姟鍒楄〃
@@ -12934,6 +12968,14 @@
objjson.data = null;
return objjson;
}
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "璇ヨ澶囨湁澶氫釜璁″垝鍗曟垨鐐规瑙勭▼,鎵嬪姩閫夌潃" ;
+ objjson.data = null;
+ return objjson;
+ }
else
{
objjson.code = "1";
@@ -12975,25 +13017,36 @@
switch (Type)
{
case "DJ":
- HView = "h_v_QJ_GetDotCheckItemList";
+ HView = "h_v_Sc_MouldDotCheckPlanBillList";
+ break;
+ case "BY":
+ HView = "h_v_Sc_MouldMaintainPlanBillList";
break;
default:
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "璁惧妯″潡绫诲瀷閿欒锛�";
+ objjson.Message = "妯″叿妯″潡绫诲瀷閿欒锛�";
objjson.data = null;
return objjson;
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
- string sql = string.Format(@"Exec h_p_Sb_GetCheckItem_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
+ string sql = string.Format(@"Exec h_p_Sb_GetCheckItemMouldFile_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
ds = oCN.RunProcReturn(sql, HView);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
objjson.count = 0;
objjson.Message = "鑾峰彇澶辫触,鏌ユ棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "璇ユā鍏锋湁澶氫釜璁″垝鍗�,鎵嬪姩閫夌潃";
objjson.data = null;
return objjson;
}
@@ -13093,6 +13146,9 @@
case "YS":
HView = "h_v_Sb_EquipRepairCheckBillList";
break;
+ case "QD":
+ HView = "h_v_Sb_EquipRepairSignBillList";
+ break;
default:
objjson.code = "0";
objjson.count = 0;
--
Gitblit v1.9.1