From a09ff1d01aeebae9037118035f10e06c570b092e Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 19 一月 2022 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 201 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 162 insertions(+), 39 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index 60943c9..22e0ba4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -150,14 +150,14 @@
msg1 = "[" + msg1.ToString() + "]";
DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1);
- long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
+ long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HShortNumber;
long HParentID = list[0].HParentID;
string HHelpCode = list[0].HHelpCode;
string HRemark = list[0].HRemark;
- string HStopflag = list[0].HStopflag == "True" ? "1" : "0";
+ bool HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
var HEmpQty = list[0].HEmpQty;
var HBarCodeForBase = list[0].HBarCodeForBase;
@@ -182,7 +182,7 @@
",HDeptNumber,HEmpQty" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
",HProcID) " +
- " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HItemID.ToString() +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
",'" + HDeptNumber + "'," + HEmpQty +
",'" + HLevel.ToString() + "'," + HEndFlag + "," + HStopflag +
",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "','" + HProcID + "')";
@@ -210,22 +210,29 @@
}
}
/// <summary>
- /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ /// 淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_Group/EditBill")]
+ [Route("Gy_Group/ModifyByID")]
[HttpPost]
- public object EditBill([FromBody] JObject oMain)
+ public object ModifyByID([FromBody] JObject oMain)
{
try
{
+ DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
+ DAL.ClsGy_Group_View oDeptHlp = new DAL.ClsGy_Group_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();
//鍙嶅簭鍒楀寲
- msg1 = "[" + msg1.ToString() + "]";
- DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
- List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1);
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
@@ -234,15 +241,20 @@
long HParentID = list[0].HParentID;
string HHelpCode = list[0].HHelpCode;
string HRemark = list[0].HRemark;
- string HStopflag = list[0].HStopflag;
+ bool HStopflag = list[0].HStopflag;
+ bool HEndFlag = list[0].HEndFlag;
string HUseFlag = list[0].HUseFlag;
var HEmpQty = list[0].HEmpQty;
var HBarCodeForBase = list[0].HBarCodeForBase;
var HDeptID = list[0].HDeptID;
- var HProcID = list[0].HProcID;
+ long HProcID = list[0].HProcID;
+ var HDeptNumber = "";
+ //var HEndFlag = 0;
+ long HLevel = 1;
+ //var HProcID = "";
- //鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ ////鍒ゆ柇鏉冮檺
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -250,6 +262,7 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+
//if (!DBUtility.ClsPub.AllowNumber(HNumber))
//{
// objJsonResult.code = "0";
@@ -258,6 +271,7 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+
//if (oDept.HavSameNumber(HItemID, HNumber))
//{
// objJsonResult.code = "0";
@@ -266,31 +280,46 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Update Gy_Group set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",HShortNumber='" + HShortNumber + "'" +
- ",HHelpCode='" + HHelpCode + "'" +
- ",HParentID=" + HParentID +
- ",HStopflag='" + HStopflag + "'" +
- ",HRemark= '" + HRemark + "'" +
- ",HDeptID=" + HDeptID +
- ",HEmpQty=" + HEmpQty +
- ",HBarCodeForBase='" + HBarCodeForBase + "' " +
- ", HProcID = '" + HProcID + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- //oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- //
- oCN.Commit();
- objJsonResult.code = "1";
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Insert into Gy_Group " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HEmpQty,HDeptID,HDeptNumber,HProcID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
+ "," + HEmpQty.ToString() + "," + HDeptID.ToString() + ",'" + HDeptNumber + "'," + HProcID.ToString() +
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ oCN.RunProc("Update Gy_Group set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HParentID=" + HParentID +
+ ",HStopflag='" + HStopflag + "'" +
+ ",HRemark= '" + HRemark + "'" +
+ ",HDeptID=" + HDeptID +
+ ",HEmpQty=" + HEmpQty +
+ ",HBarCodeForBase='" + HBarCodeForBase + "' " +
+ ", HProcID = '" + HProcID + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
- //objJsonResult.data = null;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
return objJsonResult;
}
catch (Exception e)
@@ -303,6 +332,100 @@
return objJsonResult;
}
}
+ ///// <summary>
+ ///// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Gy_Group/EditBill")]
+ //[HttpPost]
+ //public object EditBill([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
+ // DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
+ // List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1);
+
+ // long HItemID = 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;
+ // string HStopflag = list[0].HStopflag;
+ // string HUseFlag = list[0].HUseFlag;
+ // var HEmpQty = list[0].HEmpQty;
+ // var HBarCodeForBase = list[0].HBarCodeForBase;
+ // var HDeptID = list[0].HDeptID;
+ // var HProcID = list[0].HProcID;
+
+ // //鍒ゆ柇鏉冮檺
+ // //if (!ClsPub.Security_Log(msg5, 1, false, 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_Group set " +
+ // " HNumber='" + HNumber + "'" +
+ // ",HName='" + HName + "'" +
+ // ",HShortNumber='" + HShortNumber + "'" +
+ // ",HHelpCode='" + HHelpCode + "'" +
+ // ",HParentID=" + HParentID +
+ // ",HStopflag='" + HStopflag + "'" +
+ // ",HRemark= '" + HRemark + "'" +
+ // ",HDeptID=" + HDeptID +
+ // ",HEmpQty=" + HEmpQty +
+ // ",HBarCodeForBase='" + HBarCodeForBase + "' " +
+ // ", HProcID = '" + HProcID + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ // //淇敼瀛愰」鐩唬鐮�
+ // //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ // //灏嗕笂绾� 涓洪潪鏈骇
+ // //oCN.RunProc("Update Gy_Group 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;
+ // }
+ //}
/// <summary>
/// 鐝粍鍒犻櫎鍔熻兘
/// </summary>
@@ -317,7 +440,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -435,7 +558,7 @@
DAL.ClsGy_Group_View oDeptHlp = new DAL.ClsGy_Group_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;
--
Gitblit v1.9.1