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/WebAPIController.cs | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index b12808a..f894687 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -17920,6 +17920,16 @@
ListModels oListModels = new ListModels();
try
{
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("EqiupMaterWorkTimes_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl oBill = new WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl();
List<Model.ClsEqiupMaterWorkTimes_Model> lsmain = new List<Model.ClsEqiupMaterWorkTimes_Model>();
@@ -17992,6 +18002,16 @@
DataSet ds;
try
{
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("EqiupMaterWorkTimes_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
{
@@ -19060,6 +19080,51 @@
}
/// <summary>
+ /// 鑾峰彇宸℃椤圭洰鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetPatrolCheckItemList_Json")]
+ [HttpGet]
+ public object GetPatrolCheckItemList_Json(string CheckItem)
+ {
+ DataSet ds;
+ try
+ {
+ sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if(CheckItem != "" && CheckItem != null)
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) ";
+ }
+ ds = oCN.RunProcReturn("Select HItemID,HNumber,HName from Gy_PatrolCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck");
+ if(ds == null )
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch(Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
/// 鑾峰彇鐢熶骇浠诲姟鍗曞垪琛�
/// </summary>
/// <returns></returns>
@@ -19271,22 +19336,18 @@
/// <returns></returns>
[Route("Web/GetSc_ProcessExchangeBillListView")]
[HttpGet]
- public object GetSc_ProcessExchangeBillListView(string ICMOBill, int OrganizationID)
- {
- if (ICMOBill != "" & ICMOBill != null)
- {
- sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
- }
+ public object GetSc_ProcessExchangeBillListView(string sWhere,int OrganizationID)
+ {
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 鍗曟嵁鍙� desc,hsubid", "h_v_Sc_ProcessExchangeBillList");
- }
+ ds = oCN.RunProcReturn("select top 300 * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 鍗曟嵁鍙� desc,hsubid", "h_v_Sc_ProcessExchangeBillList");
+ }
else
{
- string sql = "select * from h_v_Sc_ProcessExchangeBillList " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
+ string sql = "select * from h_v_Sc_ProcessExchangeBillList where 1=1 " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList");
}
if (ds == null || ds.Tables[0].Rows.Count <= 0)
--
Gitblit v1.9.1