From 92a93a399f8c8481a9cc2f2e46b89ee0b45a98ec Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 06 五月 2025 13:14:43 +0800
Subject: [PATCH] 2025/5/6 提交
---
WebAPI/Controllers/PublicPageMethodController.cs | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 80faac1..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")]
@@ -3473,7 +3532,7 @@
SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
string sql = string.Format(@"select '鏉冮檺绠＄悊-鐢ㄦ埛' id,'' HNumber,'鏉冮檺绠＄悊--鐢ㄦ埛' title,'' ParentID
union all
- select gnbm id,gnsy HNumber,gnmc as title, case when sjgnbm='' then '鏉冮檺绠＄悊--鐢ㄦ埛' else sjgnbm end ParentID from Xt_Xtgnb where sjgnbm=''
+ select gnbm id,gnsy HNumber,gnmc as title, case when sjgnbm='' then '鏉冮檺绠＄悊--鐢ㄦ埛' else sjgnbm end ParentID from Xt_Xtgnb where sjgnbm='' and useflag=1
union all
Select gnbm id,gnsy HNumber,gnmc as title,sjgnbm as ParentID
from Xt_Xtgnb where mjbz=0 and useflag=1 and rightflag=1 and sjgnbm in(
@@ -3672,13 +3731,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_ClassTimePrjGroup where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrjGroup");
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_ClassTimePrj where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrj");
}
else
{
- string sql1 = "Select HItemID,HNumber ,HName from Gy_ClassTimePrjGroup where HStopflag=0 ";
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_ClassTimePrj where HStopflag=0 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrj");
}
//ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
--
Gitblit v1.9.1