From 55c64d855c964da4a8fbede789abb198107cadca Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 16 八月 2023 11:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
index dbd25fd..f2747a8 100644
--- a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
@@ -203,6 +203,8 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string AddOrEdit = sArray[2].ToString(); //1鏂板3缂栬緫
+ //int ItemID = Convert.ToInt32(sArray[2]);
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
@@ -218,6 +220,7 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
int ChangeHStopflag = 0;
+
if (HStopflag)
{
ChangeHStopflag = 1;
@@ -251,31 +254,40 @@
//}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
- if (HItemID == 0)
+ if (AddOrEdit == "1")
{
oCN.BeginTran();
oCN.RunProc("Insert into Xt_ORGANIZATIONS " +
" (HNumber,HName,HParentID" +
- ",HStopflag,HMakeTime" +
+ ",HStopflag,HMakeTime,HItemID" +
",HRemark) " +
" Values('" + HNumber + "','" + HName + "','" + HParentID.ToString() +
- "','" + ChangeHStopflag + "'," + "getdate()" +
+ "','" + ChangeHStopflag + "'," + "getdate()" + ",'" + HItemID + "'" +
",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
- else
+ else if(AddOrEdit == "3")
{
+ int Stopflag;
+ if (HStopflag)
+ {
+ Stopflag = 1;
+ }
+ else
+ {
+ Stopflag = 0;
+ }
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
oCN.RunProc("Update Xt_ORGANIZATIONS set " +
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
- ",HParentID=" + HParentID +
- ",HMakeTime=" + HMakeTime +
- ",HStopflag='" + HStopflag + "'" +
+ ",HParentID='" + HParentID + "'" +
+ ",HMakeTime='" + HMakeTime + "'" +
+ ",HStopflag='" + Stopflag + "'" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -298,6 +310,37 @@
}
}
/// <summary>
+ /// 鑾峰彇鏈�澶ItemID
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_ORGANIZATIONS/GetMaxHItemID")]
+ [HttpGet]
+ public object GetMaxHItemID()
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select MAX(HItemID) from Xt_ORGANIZATIONS ", "Xt_ORGANIZATIONS");
+
+
+
+ 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>
/// 缁勭粐璁剧疆鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
--
Gitblit v1.9.1