From 8ca32345fb7f2a74d3818e36d4996e83a15838f2 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 24 三月 2023 09:57:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/PublicPageMethodController.cs | 67 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 80c23d0..2c8564e 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -1491,9 +1491,10 @@
try
{
- string sql1 = "Select * from Kf_StockOutRequestBillMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Kf_StockOutRequestBillMain");
+ string sql1 = "Select * from AIS20220914133941..T_STK_OUTSTOCKAPPLY where fdocumentstatus = 'C' and FCloseStatus = 'A'";
+ string sql2 = "order by Fdate asc";
+ string sql = sql1 + sWhere + sql2;
+ ds = oCN.RunProcReturn(sql, "T_STK_OUTSTOCKAPPLY");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -2069,7 +2070,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");
}
@@ -2187,22 +2188,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)
{
@@ -3695,5 +3686,41 @@
}
#endregion
+ #region 閫夋嫨宸ュ簭鍩虹璧勬枡
+ [Route("PublicPageMethod/ProcessList")]
+ [HttpGet]
+ public object ProcessList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_Process " + sWhere + " Order by HItemID", "Gy_Process");
+ //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
+
}
}
--
Gitblit v1.9.1