MES-WEB-API.git

			@@ -134,11 +134,14 @@
			left join Gy_PoStockStyle f on s.HPSStyleID=f.HItemID
			where s.HItemID='" + HInterID + "'");
			ds = oCN.RunProcReturn(sql, "Gy_Supplier");

			DataSet cs = oCN.RunProcReturn("select * from Gy_Supplier_PayPlan where HSupID = '"+ HInterID + "'", "Gy_Supplier_PayPlan");
			List<Object> list = new List<object>();
			list.Add(cs);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = list;
			return objJsonResult;
			}
			catch (Exception e)
			@@ -165,15 +168,16 @@
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			//反序列化
			msg1 = "[" + msg1.ToString() + "]";
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString(); //主表数据
			string msg3 = sArray[1].ToString(); //子表数据
			//主表反序列化
			msg2 = "[" + msg2.ToString() + "]";

			DAL.ClsGy_Supplier_Ctl oDept = new DAL.ClsGy_Supplier_Ctl();
			DAL.ClsGy_Supplier_View oDeptHlp = new DAL.ClsGy_Supplier_View();



			List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg1);
			List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);

			long HItemID = list[0].HInterID;
			string HNumber = list[0].HNumber;
			@@ -220,9 +224,6 @@
			objJsonResult.data = null;
			return objJsonResult;
			}



			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			@@ -242,6 +243,22 @@
			"') ");
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//子表添加
			List<ClsGy_Supplier_PayPlan> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Supplier_PayPlan>>(msg3);
			int i = 0;
			DataSet Cs;
			Cs = oCN.RunProcReturn("select MAX(HItemID)HItemID from Gy_Supplier", "Gy_Supplier");
			string MaxHItemID = Cs.Tables[0].Rows[0]["HItemID"].ToString();
			//删除子表操作防止出错
			oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + MaxHItemID + "'");
			foreach (ClsGy_Supplier_PayPlan oSub in DetailColl)
			{
			i++;
			oCN.RunProc($@"Insert into Gy_Supplier_PayPlan
			(HSupID,HSubID,HPayType,HPayRate,HPayTime,HPayRemark)
			values({MaxHItemID},{i} ,'{oSub.HPayType}',{oSub.HPayRate},{oSub.HPayTime},'{oSub.HPayRemark}')");
			}

			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -333,9 +350,10 @@
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString(); //表头数据
			string msg3 = sArray[1].ToString(); //列表主ID
			string msg4 = sArray[2].ToString(); //登录人员
			string msg5 = sArray[3].ToString(); //权限模块代码
			string msg3 = sArray[1].ToString(); //子表数据
			string msg4 = sArray[2].ToString(); //列表主ID
			string msg5 = sArray[3].ToString(); //登录人员
			string msg6 = sArray[4].ToString(); //权限模块代码
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);
			@@ -378,7 +396,7 @@
			long HPSStyleID = list[0].HPSStyleID;

			//判断权限
			if (!ClsPub.Security_Log(msg5, 1, false, msg4))
			if (!ClsPub.Security_Log(msg6, 1, false, msg5))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -439,6 +457,22 @@
			//将上级为非末级
			oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//

			//子表添加
			List<ClsGy_Supplier_PayPlan> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Supplier_PayPlan>>(msg3);
			int i = 0;
			//删除子表操作防止出错
			oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + HItemID + "'");
			foreach (ClsGy_Supplier_PayPlan oSub in DetailColl)
			{
			i++;
			oCN.RunProc($@"Insert into Gy_Supplier_PayPlan
			(HSupID,HSubID,HPayType,HPayRate,HPayTime,HPayRemark)
			values({HItemID},{i} ,'{oSub.HPayType}',{oSub.HPayRate},{oSub.HPayTime},'{oSub.HPayRemark}')");
			}



			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -499,9 +533,13 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();
			//
			if (oGroup.DeleteByID(HItemID))
			{
			//删除子表
			oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + HItemID + "'");
			oCN.Commit();
			//写入日志
			ClsPub.Add_Log("", "删除项目，代码：" + oGroupHlp.omodel.HNumber + ",名称：" + oGroupHlp.omodel.HName, ClsPub.CurUserName);
			//更新上级为末级
			@@ -513,6 +551,7 @@
			}
			else
			{
			oCN.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败";