~yxj/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;
			@@ -30,6 +31,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_TechParamByProc", 1, false, user))
			{
			@@ -39,21 +41,30 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql1 = string.Format(@"select * from h_v_Gy_TechParamByProc where 1 = 1");//where 组织名称='" + Organization + "'
			string sql1 = string.Format(@"select * from h_v_Gy_TechParamByProcList where 1 = 1");//where 组织名称='" + Organization + "'
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by HEntryID ", "h_v_Gy_TechParamByProc");
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 工艺参数代码 ", "h_v_Gy_TechParamByProcList");
			}
			else
			{
			string sql = sql1 + sWhere + " order by HEntryID";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_TechParamByProc");
			string sql = sql1 + sWhere + " order by 工艺参数代码";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_TechParamByProcList");
			}

			//添加列名
			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)
			@@ -106,6 +117,52 @@
			}
			}

			#region 编辑时返回工艺参数对应表信息
			[Route("Gy_TechParamByProc/GetTechParamByProcValue")]
			[HttpGet]
			public object GetProcPriceValue(int HItemID)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			ds = oCN.RunProcReturn("select * from h_v_GetTechParamByProcValue where HInterID = " + HItemID, "h_v_GetTechParamByProcValue");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无列表信息！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			//添加列名
			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)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			/// <summary>
			/// 新增单据-保存按钮
			///参数：string sql。
			@@ -151,7 +208,7 @@
			long HTechParamUnitID = list[0].HTechParamUnitID;
			string HStd = list[0].HStd;
			long HDeptID = list[0].HDeptID;
			DateTime HMakeDate = list[0].HMakeDate;
			DateTime HMakeDate = DateTime.Now;

			//DateTime HDeleteDate = list[0].HDeleteDate;

			@@ -207,9 +264,6 @@
			{
			try
			{
			DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl();
			DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View();

			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			@@ -219,90 +273,111 @@
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<TechParamByProc> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechParamByProc>>(msg2);
			List<TechParamByProc> sublist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechParamByProc>>(msg3);

			long HInterID = list[0].HInterID;
			string HMaker = list[0].HMaker;
			string HChecker = list[0].HChecker;
			string HRemark = list[0].HRemark;
			//string HStopflag = list[0].HStopflag;
			long HMaterID = list[0].HMaterID;
			long HProcID = list[0].HProcID;
			long HTechParamID = list[0].HTechParamID;
			long HTechParamUnitID = list[0].HTechParamUnitID;
			string HStd = list[0].HStd;
			long HDeptID = list[0].HDeptID;
			DateTime HMakeDate = list[0].HMakeDate;
			DAL.ClsGy_TechParamByProc_Ctl BillNew = new DAL.ClsGy_TechParamByProc_Ctl();
			List<Model.ClsGy_TechParamByProc_Model> DetailColl = new List<Model.ClsGy_TechParamByProc_Model>();

			////判断权限
			//if (!ClsPub.Security_Log("Gy_TechnologyParameter_Add_Edit_", 1, false, msg3))
			for (int i = 0; i < sublist.ToArray().Length; i++)
			{
			if (i >= 0)//HQty
			{
			Model.ClsGy_TechParamByProc_Model oSub = new Model.ClsGy_TechParamByProc_Model();
			oSub.HInterID = DBUtility.ClsPub.isLong(sublist[i].HInterID);
			oSub.HMaker = DBUtility.ClsPub.isStrNull(list[0].HMaker);
			oSub.HChecker = DBUtility.ClsPub.isStrNull(list[0].HChecker);
			oSub.HRemark = DBUtility.ClsPub.isStrNull(sublist[i].HRemark);
			oSub.HMaterID = DBUtility.ClsPub.isLong(sublist[i].HMaterID);
			oSub.HProcID = DBUtility.ClsPub.isLong(sublist[i].HProcID);
			oSub.HTechParamID = DBUtility.ClsPub.isLong(list[0].HTechParamID);
			oSub.HTechParamUnitID = DBUtility.ClsPub.isLong(list[0].HTechParamUnitID);
			oSub.HStd = DBUtility.ClsPub.isLong(sublist[i].HStd);
			oSub.HDeptID = DBUtility.ClsPub.isLong(sublist[i].HDeptID);
			oSub.HMakeDate = DateTime.Now;

			BillNew.DetailColl.Add(oSub);
			DetailColl.Add(oSub);
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无明细行信息!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			//if (!DBUtility.ClsPub.AllowNumber(HStd))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有找到该功能模块！";
			// objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			if (!DBUtility.ClsPub.AllowNumber(HStd))
			// 批量操作（新增）
			foreach (Model.ClsGy_TechParamByProc_Model oSub in DetailColl)
			{
			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;
			//}
			//保存
			//保存完毕后处理
			if (HInterID == 0)
			{
			//当前时间
			var currentTime = DateTime.Now.ToString();
			oCN.BeginTran();
			//主表
			oCN.RunProc("Insert into Gy_TechParamByProc " +
			" (HInterID,HMaker,HChecker,HRemark,HMaterID" +
			",HProcID,HTechParamID,HTechParamUnitID,HStd,HMakeDate" +
			",HDeptID) " +
			" Values('" + HInterID + "','" + HChecker + "','" + HChecker + "','" + HRemark + "','" + HMaterID + "','" + HProcID + "','" + HTechParamID + "','" + HTechParamUnitID + "','" + HStd + "','" + currentTime + "','" + HDeptID + "')");

			// Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HEntryID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			}
			else
			{
			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Update Gy_TechParamByProc set " +
			" HStd='" + HStd + "'" +
			//",HName='" + HName + "'" +
			//",HShortNumber='" + HShortNumber + "'" +
			//",HHelpCode='" + HHelpCode + "'" +
			//",HLevel='" + HLevel.ToString() + "'" +
			//",HParentID='" + HParentID.ToString() + "'" +
			//",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
			//",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
			//",HUseFlag=" + Convert.ToString(HUseFlag ? 1 : 0) +
			//",HMakeTime= getdate()" +
			//",HMakeEmp='" + HMakeEmp + "'" +
			/",HRemark='" + HRemark + /"Where HEntryID='" + HInterID + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			//oCN.RunProc("Update Gy_TechParamByProc set HEndflag=0 where HEntryID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//
			oCN.Commit();
			//保存完毕后处理
			if (oSub.HInterID == 0)
			{
			DataSet Ds;
			Int64 HEntryID = 1;
			Ds = oCN.RunProcReturn("select MAX(HEntryID) HEntryID from Gy_TechParamByProc", "Gy_TechParamByProc");
			if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
			{
			HEntryID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HEntryID"].ToString());
			HEntryID += 1;
			}
			DataSet Cs;
			oSub.HInterID = 1;
			Cs = oCN.RunProcReturn("select MAX(HInterID) HInterID from Gy_TechParamByProc", "Gy_TechParamByProc");
			if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
			{
			oSub.HInterID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HInterID"].ToString());
			oSub.HInterID += 1;
			}
			//当前时间
			var currentTime = DateTime.Now.ToString();
			oCN.BeginTran();
			//主表
			oCN.RunProc("Insert into Gy_TechParamByProc " +
			" (HInterID,HEntryID,HMaker,HChecker,HRemark,HMaterID" +
			",HProcID,HTechParamID,HTechParamUnitID,HStd,HMakeDate" +
			",HDeptID) " +
			" Values('" + oSub.HInterID + "','" + HEntryID + "','" + oSub.HMaker + "','" + oSub.HChecker + "','" + oSub.HRemark + "','" + oSub.HMaterID + "','" + oSub.HProcID + "','" + oSub.HTechParamID + "','" + oSub.HTechParamUnitID + "','" + oSub.HStd + "','" + currentTime + "','" + oSub.HDeptID + "')");
			// Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag
			//修改上级为非末级代码
			//oCN.RunProc("Update Gy_TechParamByProc set HEndflag=0 where HEntryID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			}
			else
			{
			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Update Gy_TechParamByProc set " +
			" HStd='" + oSub.HStd + "'" +
			",HMaterID='" + oSub.HMaterID + "'" +
			",HProcID='" + oSub.HProcID + "'" +
			",HTechParamID='" + oSub.HTechParamID + "'" +
			",HTechParamUnitID='" + oSub.HTechParamUnitID + "'" +
			",HDeptID='" + oSub.HDeptID + "'" +
			",HRemark='" + oSub.HRemark + "'" +
			//",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
			//",HUseFlag=" + Convert.ToString(HUseFlag ? 1 : 0) +
			//",HMakeTime= getdate()" +
			//",HMakeEmp='" + HMakeEmp + "'" +
			/",HRemark='" + HRemark + /"Where HInterID ='" + oSub.HInterID + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			//oCN.RunProc("Update Gy_TechParamByProc set HEndflag=0 where HEntryID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//
			oCN.Commit();
			}
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -334,16 +409,6 @@
			DataSet ds1;
			try
			{
			//删除权限
			//if (!DBUtility.ClsPub.Security_Log("DeltetGy_TechnologyParameter", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无删除权限";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			@@ -363,34 +428,6 @@
			objJsonResult.data = null;
			return objJsonResult; ;
			}
			//var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
			//if (HStopflag)
			//{
			// oCN.RollBack();//回滚事务
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "数据已删除无法再次删除！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//ds1 = oCN.RunProcReturn("Select HItemID from Gy_TechParamByProc Where HParentID='" + HItemID + "'", "Gy_TechParamByProc");
			//if (ds1.Tables[0].Rows.Count != 0)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "此项目存在子项目，不能删除！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
			//if (HUseFlag == "已使用")
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "此项目已使用，不能删除！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			oCN.RunProc("delete from Gy_TechParamByProc where HInterID=" + HItemID);
			oCN.Commit();//提交事务