From fd56fa51fe25f26ce5b518c6f3afb81fbc19553a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 25 七月 2022 17:04:53 +0800
Subject: [PATCH] 盘点
---
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 156 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 105 insertions(+), 51 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 33cf622..5c468b7 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -8,6 +8,8 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using Newtonsoft.Json;
+
namespace WebAPI.Controllers
{
public class Gy_WorkCenterController : ApiController
@@ -18,44 +20,43 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
/// <summary>
- /// 杩斿洖宸ヤ綔涓績鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
+ /// 宸ヤ綔涓績鍔ㄦ�佸垪
/// </summary>
- [Route("Gy_WorkCenter/list")]
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Gy_WorkCenter/Gy_WorkCenterDyCollist")]
[HttpGet]
- public object list(string sWhere)
+ public object Gy_WorkCenterDyCollist(string sWhere,string user)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_WorkCenterList " + sWhere, "h_v_WorkCenterList");
- }
- else
- {
- string sql1 = "select * from h_v_WorkCenterList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_WorkCenterList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
+
+ ds = oCN.RunProcReturn("select * from h_v_WorkCenterList where 1 = 1 " + sWhere + " order by 宸ヤ綔涓績浠ｇ爜 ", "h_v_WorkCenterList");
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
}
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
}
catch (Exception e)
{
@@ -66,6 +67,48 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 杩斿洖宸ヤ綔涓績鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkCenter/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_WorkCenterList where 1 = 1 " + sWhere + " order by 宸ヤ綔涓績浠ｇ爜 ", "h_v_WorkCenterList");
+
+ 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;
+ }
+ }
+
+
+
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
@@ -227,15 +270,26 @@
DAL.ClsGy_WorkCenter_View oDeptHlp = new DAL.ClsGy_WorkCenter_View();
var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
+ msg1 = "[" + msg1.ToString() + "]";
+ List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
@@ -255,16 +309,17 @@
var HProcID = list[0].HProcID;
var HLevel = list[0].HLevel;
var HWorkTimes = list[0].HWorkTimes;
+ int HUSEORGID = list[0].HUSEORGID;
- ////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//if (!DBUtility.ClsPub.AllowNumber(HNumber))
//{
@@ -292,11 +347,11 @@
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HDeptNumber,HWorkTimes,HQty" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
- ",HProcID,HDayMoney) " +
+ ",HProcID,HDayMoney,HUSEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
- ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -442,22 +497,21 @@
/// <returns></returns>
[Route("DeltetGy_WorkCenter")]
[HttpGet]
- public object DeltetGy_WorkCenter(string HItemID)
+ public object DeltetGy_WorkCenter(string HItemID,string user)
{
DataSet ds;
DataSet ds1;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_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))
--
Gitblit v1.9.1