MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections;
			@@ -27,10 +28,11 @@
			/// </summary>
			[Route("Gy_Unit/list1")]
			[HttpGet]
			public object list(string sWhere,string user,string Organization)
			public object list(string sWhere, string user, string Organization)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_UnitGroup", 1, false, user))
			{
			@@ -51,12 +53,21 @@
			string sql = sql1 + sWhere + "order by 计量单位代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_UnitList");
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;


			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -110,6 +121,8 @@
			string[] sArray = msg4.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg_HUSEORGID = sArray[2].ToString();
			Single msg_HRate = float.Parse(sArray[3]);
			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			@@ -251,10 +264,11 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //组织id
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oItem.HRate= DBUtility.ClsPub.GetLevel(oItem.HRate.ToString().Trim());//换算比例
			oItem.HRate = msg_HRate;//换算比例
			oBill.oModel = oItem;
			}

			@@ -298,6 +312,50 @@
			}
			}

			[Route("Gy_Unit/SaveGy_UnitListApi")]
			[HttpPost]
			public object SaveGy_UnitListApi([FromBody] JObject msg)
			{
			try
			{
			var _value = msg["model"].ToString();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ListModels oListModels = new ListModels();
			List<Model.ClsGy_Unit_Model> lsmain = new List<Model.ClsGy_Unit_Model>();
			lsmain = oListModels.getObjectByJson_Gy_Unit(_value);
			string sql = string.Empty;
			//保存
			oCN.BeginTran();
			sql = $"delete Gy_Unit where HItemID = {lsmain[0].HItemID}";
			oCN.RunProc(sql);
			sql = "set identity_insert Gy_Unit on";
			oCN.RunProc(sql);
			oCN.RunProc("Insert into Gy_Unit" +
			" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID) " +
			" Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID.ToString() +
			"," + lsmain[0].HLevel.ToString() + "," + Convert.ToString(lsmain[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(lsmain[0].HStopflag ? 1 : 0) + ",'" + lsmain[0].HRemark +
			"'," + lsmain[0].HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(lsmain[0].HStandard) + "," + lsmain[0].HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			sql = "set identity_insert Gy_Unit off";
			oCN.RunProc(sql);
			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			/// <summary>
			/// 计量单位获取信息
			/// </summary>
			@@ -316,7 +374,7 @@
			/// <returns></returns>
			[Route("DeltetGy_Unit")]
			[HttpGet]
			public object DeltetGy_Unit(string HItemID,string user)
			public object DeltetGy_Unit(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			@@ -362,7 +420,7 @@
			return objJsonResult;
			}

			oCN.RunProc("update Gy_Unit set HStopflag=1 where HItemID=" + HItemID);
			oCN.RunProc("delete from Gy_Unit where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;