From 2c67df91fda91f2cc47c231231ca311e2b7f5d08 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 19 四月 2024 13:31:26 +0800
Subject: [PATCH] 设备保养逾期预警报表；报工台根据 生产资源 + 用户 删除所绑定的生产资源
---
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 58 +++++++++++++++++++++++++++++
WebAPI/Controllers/ReportPlatFormController.cs | 4 +-
2 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index 2a1c600..5a410a8 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -161,13 +161,13 @@
#region 鎶ュ伐骞冲彴鍒犻櫎璧勬簮鍒楄〃
[Route("ReportPlatForm/DeleteGetLineBindBillList")]
[HttpGet]
- public object DeleteGetLineBindBillList(string HSourceID)
+ public object DeleteGetLineBindBillList(string HSourceID,string user)
{
try
{
oCN.BeginTran();
//鏇存柊鍒囨崲鐘舵�佸��
- string sql = string.Format(@"delete Gy_SourceRelationSet where HSourceID='" + HSourceID + "'");
+ string sql = string.Format(@"delete Gy_SourceRelationSet where HSourceID='" + HSourceID + "' and HUserName = '" + user + "'");
oCN.RunProc(sql);
oCN.Commit();
objJsonResult.code = "1";
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index 49598c4..de5046d 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -941,5 +941,63 @@
#endregion
#endregion
+
+ #region 璁惧淇濆吇閫炬湡棰勮鎶ヨ〃
+
+ [Route("Sb_EquipMaintainWarning/Report")]
+ [HttpGet]
+ public object Report(string HYear, string HEquipTypeID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (HYear == null || HYear.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤";
+ objJsonResult.data = "";
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ string sql = "exec h_p_Sb_EquipMaintainWarningReport " + HYear + "," + HEquipTypeID;
+ ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipMaintainWarningReport");
+ }
+
+ //娣诲姞鍒楀悕
+ 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