~yxj/MES-WEB-API.git

			@@ -25,19 +25,18 @@
			/// </summary>
			[Route("Xt_ORGANIZATIONS/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere,string Organization)
			{
			try

			{
			string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 组织名称='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_ORGANIZATIONSList " + sWhere, "h_v_IF_ORGANIZATIONSList");
			ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_ORGANIZATIONSList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_ORGANIZATIONSList where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere + "order by HItemID desc";
			ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			@@ -103,12 +102,12 @@
			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			string sql = "Insert into Xt_ORGANIZATIONS " +
			" (HNumber,HName,HParentID" +
			",HStopflag" +
			string sql = "Insert into Xt_ORGANIZATIONS " +
			" (HNumber,HName,HParentID" +
			",HStopflag,HMakeTime" +
			",HRemark) " +
			" Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
			"," + HStopflag +
			"," + HStopflag + "getdate()" +
			",'" + HRemark + "')";
			oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			@@ -161,7 +160,7 @@
			long HItemID = list[0].HItemID;
			string HNumber = list[0].HNumber;
			string HName = list[0].HName;

			DateTime HMakeTime = list[0].HMakeTime;
			long HParentID = list[0].HParentID;

			string HRemark = list[0].HRemark;
			@@ -201,14 +200,14 @@
			oCN.BeginTran();
			oCN.RunProc("Insert into Xt_ORGANIZATIONS " +
			" (HNumber,HName,HParentID" +
			",HStopflag" +
			",HStopflag,HMakeTime" +
			",HRemark) " +
			" Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
			"," + HStopflag +
			"," + HStopflag + "getdate()"+
			",'" + 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
			@@ -219,6 +218,7 @@
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HParentID=" + HParentID +
			",HMakeTime=" + HMakeTime +
			",HStopflag='" + HStopflag + "'" +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);