From 76dfcdf6ced44433f4e70f9cc3edc8bb46635fa3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 21 一月 2023 12:12:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/PublicPageMethodController.cs | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index b4ec766..02a85d8 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -1481,6 +1481,47 @@
}
#endregion
+
+
+ #region 鍑哄簱鐢宠鍗曟煡璇㈠垪琛�
+ [Route("OtherOutRequestBillList/CX")]
+ [HttpGet]
+ public object CX(string sWhere)
+ {
+ try
+ {
+
+ string sql1 = "Select * from Kf_StockOutRequestBillMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Kf_StockOutRequestBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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/EqpCX")]
[HttpGet]
@@ -2028,7 +2069,7 @@
}
else
{
- string sql1 = "Select HItemID,HParentID,HNumber,HName from h_v_IF_Unit ";
+ string sql1 = "Select HItemID,HParentID,HNumber,HName from h_v_IF_Unit ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_Unit");
}
@@ -2146,22 +2187,12 @@
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "Gy_Property");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
--
Gitblit v1.9.1