From 7b33dfdb3104e3dcdafc024b5688e87db93c579e Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 10 六月 2021 17:26:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 425 +++++++++++++++++++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs | 2
WebAPI/WebAPI.csproj.user | 2
WebAPI/WebAPI.csproj | 1
4 files changed, 428 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
index 88d556e..6c2baa4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
@@ -373,7 +373,7 @@
return objJsonResult;
}
}
- #endregion
+ #endregion
/// <summary>
diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
new file mode 100644
index 0000000..16dc3b3
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
@@ -0,0 +1,425 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.BaseSet
+{
+ public class Gy_QCCheckClassController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 妫�楠岄」鐩垪琛ㄦ暟鎹�
+ /// <summary>
+ /// 杩斿洖妫�楠岄」鐩垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_QCCheckClass/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckClassList " + sWhere, "h_v_IF_QCCheckClassList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_QCCheckClassList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckClassList");
+ }
+ 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 妫�楠岄」鐩牴鎹爲鍨婭D鏌ヨ鎵�鏈夊眰绾у垪琛ㄦ暟鎹�
+ /// <summary>
+ /// 鏍规嵁鏍戝瀷ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_QCCheckClass/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ //ds = oCN.RunProcReturn("select * from h_v_IF_RepairCheckList where HitemID=" + HInterID, "h_v_IF_RepairCheckList");
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_IF_QCCheckClassList WHERE HitemID=" + HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_IF_QCCheckClassList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_IF_QCCheckClassList");
+ 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 鍒犻櫎妫�楠岄」鐩�
+ /// <summary>
+ /// 妫�楠岄」鐩垪琛ㄥ垹闄ゆ寜閽�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_QCCheckClass/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
+ {
+ DAL.ClsGy_QCCheckClass_Ctl oDept = new DAL.ClsGy_QCCheckClass_Ctl();
+ DAL.ClsGy_QCCheckClass_View oDeptHlp = new DAL.ClsGy_QCCheckClass_View();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oDeptHlp.GetInfoByID(HItemID))
+ {
+ if (oDept.HavChildCodes(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
+ if (oDeptHlp.omodel.HUseFlag != "鏈娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //
+ if (oDept.DeleteByID(HItemID))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妫�楠岄」鐩柊澧炰繚瀛�
+ /// <summary>
+ /// 妫�楠岄」鐩�-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_QCCheckClass/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+
+ DAL.ClsGy_QCCheckClass_Ctl oDept = new DAL.ClsGy_QCCheckClass_Ctl();
+ DAL.ClsGy_QCCheckClass_View oDeptHlp = new DAL.ClsGy_QCCheckClass_View();
+
+
+
+ List<CheckItem> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<CheckItem>>(msg1);
+
+ long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ bool HUseFlag = list[0].HUseFlag;
+ long HQCCheckClassID = list[0].HQCCheckClassID;
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_QCCheckClass " +
+ "(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag) " +
+ " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
+ ",'1',0,'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','0')");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_QCCheckClass set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妫�楠岄」鐩慨鏀逛繚瀛�
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_QCCheckClass/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ DAL.ClsGy_QCCheckClass_Ctl oDept = new DAL.ClsGy_QCCheckClass_Ctl();
+ DAL.ClsGy_QCCheckClass_View oDeptHlp = new DAL.ClsGy_QCCheckClass_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 msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<MaintenanceAcceptItem> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceAcceptItem>>(msg2);
+
+ long HItemID = int.Parse(msg3);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ string HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oDept.HavSameNumber(HItemID, HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_QCCheckClass set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HParentID=" + HParentID +
+ ",HStopflag='" + HStopflag + "'" +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_QCCheckClass set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妫�楠岄」鐩慨鏀硅幏鍙栫粦瀹氭暟鎹�
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_QCCheckClass/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_QCCheckClass where HItemID=" + HInterID, "Gy_QCCheckClass");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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 妫�楠岄」鐩幏鍙栨爲鍨嬪垪琛ㄦ暟鎹�
+ [Route("Gy_QCCheckClass/LoadTree")]
+ [HttpGet]
+ public object LoadTree_Json(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckClassLoadTree", "h_v_Gy_QCCheckClassLoadTree");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index bb68b2a..aa5e5c3 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -314,6 +314,7 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceAcceptItemController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceItemController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index c934955..17bf393 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -16,7 +16,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
--
Gitblit v1.9.1