From 25849768b45e51a2f5ac0bd4df7bb98b24da9cd7 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 07 二月 2022 17:18:22 +0800
Subject: [PATCH] 工序管理
---
WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs | 105 ++++++++++++++--------------------------------------
1 files changed, 29 insertions(+), 76 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
index 9077f09..db3f653 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
@@ -20,6 +20,9 @@
DataSet ds;
+ #region 缁翠慨鏂瑰紡
+
+ #region 缁翠慨鏂瑰紡鍔犺浇鍒楄〃
/// <summary>
/// 杩斿洖缁翠慨鏂瑰紡鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -67,8 +70,9 @@
return objJsonResult;
}
}
+ #endregion
-
+ #region 缁翠慨鏂瑰紡鏍规嵁鏍戝瀷id鏌ヨ鍒楄〃
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
///鍙傛暟锛歴tring sql銆�
@@ -81,7 +85,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_RepairTypeList where HitemID=" + HInterID, "h_v_IF_RepairTypeList");
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_IF_RepairTypeList WHERE HitemID="+ HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_IF_RepairTypeList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_IF_RepairTypeList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -108,7 +112,9 @@
return objJsonResult;
}
}
+ #endregion
+ #region 缁翠慨鏂瑰紡鍒犻櫎
/// <summary>
/// 缁翠慨鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -122,7 +128,7 @@
DAL.ClsGy_RepairType_View oDeptHlp = new DAL.ClsGy_RepairType_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -187,73 +193,9 @@
return objJsonResult;
}
}
+ #endregion
- //[Route("Gy_Department/LoadTree")]
- //[HttpGet]
- //public object LoadTree_Json()
- //{
- // DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName);
- //}
-
-
- /// <summary>
- /// 缁翠慨鏂瑰紡鍒楄〃绂佺敤鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_MaintenanceMode/JY_Json")]
- [HttpGet]
- public object JY_Json(long HItemID)
- {
- try
- {
- ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 1 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;
- }
- }
-
- /// <summary>
- /// 缁翠慨鏂瑰紡鍒楄〃鍙嶇鐢ㄦ寜閽�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_MaintenanceMode/FJY_Json")]
- [HttpGet]
- public object FJY_Json(long HItemID)
- {
- try
- {
- ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 0 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;
- }
- }
-
+ #region 缁翠慨鏂瑰紡鏂板淇濆瓨
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -277,7 +219,7 @@
List<MaintenanceMode> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceMode>>(msg1);
- long HItemID = list[0].HItemID;
+ 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;
@@ -305,10 +247,13 @@
oCN.RunProc("Insert Into Gy_RepairType " +
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark) " +
- " values('" + HNumber + "','"+ HName + "','"+ HHelpCode + "','" + HShortNumber + "','0'" +
+ " values('" + HNumber + "','"+ HName + "','"+ HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
",'1',0,'" + HStopflag + "','"+ HRemark + "')");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_RepairType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_RepairType set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -326,8 +271,9 @@
return objJsonResult;
}
}
+ #endregion
-
+ #region 缁翠慨鏂瑰紡淇敼淇濆瓨
/// <summary>
/// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -358,7 +304,7 @@
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
- long HParentID = list[0].HParentID;
+ 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;
@@ -366,7 +312,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -406,7 +352,7 @@
",HStopflag='" + HStopflag + "'" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairType,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
oCN.RunProc("Update Gy_RepairType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
//
@@ -427,6 +373,7 @@
return objJsonResult;
}
}
+ #endregion
/// <summary>
@@ -459,6 +406,8 @@
}
+ #region 缁翠慨鏂瑰紡淇敼鑾峰彇閫変腑鏁版嵁
+
/// <summary>
/// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
///鍙傛暟锛歴tring sql銆�
@@ -487,8 +436,10 @@
return objJsonResult;
}
}
+ #endregion
+ #region 缁翠慨鏂瑰紡鑾峰彇鏍戝瀷鏁版嵁
[Route("Gy_MaintenanceMode/LoadTree")]
[HttpGet]
@@ -515,7 +466,9 @@
return objJsonResult;
}
}
+ #endregion
+ #endregion
//
--
Gitblit v1.9.1