MES-WEB-API.git

			@@ -142,7 +142,7 @@
			try
			{

			ds = oCN.RunProcReturn("select * from h_v_Gy_TechnologyParameterList where HitemID=" + HInterID, "h_v_Gy_TechnologyParameterList");
			ds = oCN.RunProcReturn("select * from h_v_Gy_TechnologyParameterEdit where HitemID=" + HInterID, "h_v_Gy_TechnologyParameterEdit");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -231,7 +231,7 @@
			return objJsonResult;
			}

			List<TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechnologyParameter>>(msg1);
			List<Gy_TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameter>>(msg1);

			long HItemID = list[0].HItemID;
			string HNumber = list[0].HNumber;
			@@ -246,6 +246,7 @@
			string HUseFlag = list[0].HUseFlag;
			DateTime HMakeTime = list[0].HMakeTime;
			string HMakeEmp = list[0].HMakeEmp;


			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			@@ -304,11 +305,25 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();

			//判断权限
			if (!ClsPub.Security_Log("Gy_TechnologyParameter_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}



			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechnologyParameter>>(msg2);

			List<Gy_TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameter>>(msg2);
			List<Gy_TechnologyParameterSub> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameterSub>>(msg3
			);
			long HItemID = list[0].HItemID;
			string HNumber = list[0].HNumber;
			string HName = list[0].HName;
			@@ -323,17 +338,10 @@
			DateTime HMakeTime = list[0].HMakeTime;
			string HMakeEmp = list[0].HMakeEmp;
			long HUSEORGID = list[0].HUSEORGID;
			long HCREATEORGID = list[0].HCREATEORGID;
			long HCREATEORGID = list[0].HCREATEORGID;
			long HUnitID = list[0].HUnitID;
			long HClassID = list[0].HClassID;

			//判断权限
			if (!ClsPub.Security_Log("Gy_TechnologyParameter_Edit", 1, false, msg3))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			@@ -344,19 +352,13 @@
			return objJsonResult;
			}

			//if (oDept.HavSameNumber(HItemID, HNumber))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "代码重复！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//保存

			//保存完毕后处理
			if (HItemID == 0)
			{
			oCN.BeginTran();



			//保存前控制=========================================
			string sql1 = "exec h_p_Gy_TechnologyParameter_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
			@@ -380,17 +382,57 @@
			oCN.RollBack();
			return objJsonResult;
			}

			string _sql = "select HItemID from Gy_TechnologyParameter where HNumber = N'" + HNumber + "'";
			DataSet _ds = oCN.RunProcReturn(_sql, "Gy_TechnologyParameter");
			if (_ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败: 工艺参数代码重复!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("Insert into Gy_TechnologyParameter " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID,HLevel" +
			",HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HUSEORGID,HCREATEORGID) " +
			",HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HUSEORGID,HCREATEORGID, HClassID, HUnitID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID.ToString() +
			"','" + HLevel.ToString() + "','" + HEndFlag + "','" + HStopflag + "','" + HRemark + "','" + HUseFlag + "',getdate(),'" + HMakeEmp + "','" + HUSEORGID + "','" + HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			"','" + HLevel.ToString() + "','" + HEndFlag + "','" + HStopflag + "','" + HRemark + "','" + HUseFlag + "',getdate(),'" + HMakeEmp + "','" + HUSEORGID + "','" + HCREATEORGID + "','" + HClassID + "','" + HUnitID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			// Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

			// 执行查询获取HItemID
			DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_TechnologyParameter where HNumber = N'" + HNumber + "'", "Gy_TechnologyParameter");

			if (temp_ds.Tables[0].Rows.Count < 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因：插入主表数据失败";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
			string sql3 = "";

			// 改为for循环，HEntryID从1开始递增
			for (int i = 0; i < list1.Count; i++)
			{
			// 获取当前循环的实体对象
			Gy_TechnologyParameterSub listOne = list1[i];
			int entryID = i + 1;

			sql3 += "insert into Gy_TechnologyParameterSub(HInterID, HEntryID, HRemark,HEquipID,HTechParamAliasName) Values("
			+ itemID + "," + entryID + ",N'" + listOne.HRemark + "','" + listOne.HEquipID + "','" + listOne.HTechParamAliasName + "');";
			}

			oCN.RunProcReturn(sql3, "Gy_TechnologyParameterSub");


			//保存后控制=========================================
			@@ -461,12 +503,32 @@
			",HUseFlag='" + HUseFlag + "'" +
			",HModifyTime= getdate()" +
			",HModifyEmp='" + HMakeEmp + "'" +
			",HClassID='" + HClassID + "'" +
			",HUnitID='" + HUnitID + "'" +
			",HUSEORGID='" + HUSEORGID + "'" +
			",HRemark='" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

			oCN.RunProcReturn("delete from Gy_TechnologyParameterSub where HInterID = " + HItemID, "Gy_TechnologyParameterSub");

			string sql3 = "";

			// 改为for循环，HEntryID从1开始递增
			for (int i = 0; i < list1.Count; i++)
			{
			// 获取当前循环的实体对象
			Gy_TechnologyParameterSub listOne = list1[i];
			int entryID = i + 1;

			sql3 += "insert into Gy_TechnologyParameterSub(HInterID, HEntryID, HRemark,HEquipID,HTechParamAliasName) Values("
			+ HItemID + "," + entryID + ",N'" + listOne.HRemark + "','" + listOne.HEquipID + "','" + listOne.HTechParamAliasName + "');";
			}

			oCN.RunProcReturn(sql3, "Gy_TechnologyParameterSub");

			//保存后控制=========================================
			string sql2 = "exec h_p_Gy_TechnologyParameter_AfterSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_TechnologyParameter_AfterSaveCtrl");