From 5a3caef6e991f1ee69d8e5dc355468e570805e32 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 16 一月 2025 12:56:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/PublicPageMethodController.cs | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 45881d2..d6dfe93 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -918,6 +918,35 @@
return objJsonResult;
}
}
+
+ [Route("PublicPageMethod/Gy_RepairList_PDA")]
+ [HttpGet]
+ public object Gy_RepairList_PDA(string sWhere)
+ {
+ try
+ {
+ if (sWhere != "" && sWhere != null)
+ {
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ }
+ string sql1 = string.Format(@"Select HItemID,HParentID,HNumber,HName from Gy_Repair where HStopflag=0");
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "Gy_Repair");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
#region 鏍规嵁鏍戝瀷id鏌ユ壘缁翠慨椤圭洰鍒楄〃
@@ -1365,7 +1394,37 @@
return objJsonResult;
}
}
- #endregion
+ //鏁呴殰鍘熷洜椤甸潰浼樺寲鍚庢煡璇� 20250113
+ [Route("PublicPageMethod/Gy_ConkReasonList_PDA")]
+ [HttpGet]
+ public object List_PDA(string sWhere)
+ {
+ try
+ {
+ if (sWhere != "" && sWhere != null)
+ {
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ }
+ string sql1 = string.Format(@"Select HItemID,HParentID,HNumber,HName from Gy_ConkReason where HStopflag=0");
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "Gy_ConkReason");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
#region 鏍规嵁鏍戝瀷id鏌ユ壘鏁呴殰鍘熷洜璁剧疆鍒楄〃
[Route("Gy_MaintenanceMode/FaultReasonCX")]
--
Gitblit v1.9.1