From 34c3b4b4a135316adb353f110fb1bd95c653ccad Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 01 十二月 2022 15:25:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
index 1e3634f..f2747a8 100644
--- a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
@@ -75,6 +75,48 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_ORGANIZATIONS/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_ORGANIZATIONSList where HitemID=" + HInterID, "h_v_IF_ORGANIZATIONSList");
+ 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;
+ }
+ }
+
+
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -161,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();
//鍙嶅簭鍒楀寲
@@ -175,7 +219,12 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
+ int ChangeHStopflag = 0;
+ if (HStopflag)
+ {
+ ChangeHStopflag = 1;
+ }
//鍒ゆ柇鏉冮檺
if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg3))
{
@@ -205,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() +
- "," + HStopflag + "getdate()" +
+ " Values('" + HNumber + "','" + HName + "','" + HParentID.ToString() +
+ "','" + ChangeHStopflag + "'," + "getdate()" + ",'" + HItemID + "'" +
",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- //oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, 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();
@@ -243,7 +301,7 @@
}
catch (Exception e)
{
- oCN.RollBack();
+ //oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.Message;
@@ -252,7 +310,38 @@
}
}
/// <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>
[Route("DeltetXt_ORGANIZATIONSList")]
@@ -284,7 +373,7 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONSList where HItemID=" + HItemID, "Xt_ORGANIZATIONSList");
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HItemID=" + HItemID, "Xt_ORGANIZATIONS");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -304,7 +393,7 @@
return objJsonResult;
}
- oCN.RunProc("update Xt_ORGANIZATIONSList set HStopflag=1 where HItemID=" + HItemID);
+ oCN.RunProc("delete from Xt_ORGANIZATIONS where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
--
Gitblit v1.9.1