MES-WEB-API.git

			@@ -434,6 +434,53 @@
			}
			}

			/// <summary>
			/// 查询子表方法
			/// </summary>
			[Route("Gy_WorkCenter/listSub")]
			[HttpGet]
			public object listSub(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from h_v_WorkCenterSubList where 1 = 1 " + sWhere + " order by HItemID ", "h_v_WorkCenterSubList");

			//添加列名
			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;
			}
			}




			@@ -600,6 +647,7 @@
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg2 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();
			//string msg4 = sArray[2].ToString();
			//string msg5 = sArray[3].ToString();

			@@ -612,10 +660,12 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			//反序列化
			msg1 = "[" + msg1.ToString() + "]";

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

			List<ClsGy_WorkCenterSub> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_WorkCenterSub>>(msg4);

			long HItemID = list[0].HItemID;
			string HNumber = list[0].HNumber;
			@@ -696,6 +746,7 @@
			//保存完毕后处理
			if (HItemID == 0)
			{
			LogService.Write("新增");
			oCN.BeginTran();
			//判断代码是否重复
			DataSet dss;
			@@ -733,20 +784,43 @@
			}
			//==================================================================================


			oCN.RunProc("Insert into Gy_WorkCenter " +
			string sql_Temp = "Insert into Gy_WorkCenter " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HDeptNumber,HWorkTimes,HQty,HUseFlag" +
			",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
			",HProcID,HDayMoney,HUSEORGID,HCREATEORGID,HMaker,HMakeTime) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
			",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +",'"+ HUseFlag+
			"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
			",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + "," + HUSEORGID + "," + HCREATEORGID + "" +
			",'" + HMaker + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID.ToString() +
			"','" + HDeptNumber + "'," + HWorkTimes + "," + HQty + ",'" + HUseFlag +
			"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + ",'" + Convert.ToString(HStopflag ? 1 : 0) +
			"','" + HRemark + "','" + HDeptID + "','" + HBarCodeForBase + "','" + HProcID + "'," + HDayMoney + "," + HUSEORGID + "," + HCREATEORGID + "" +
			",'" + HMaker + "',getdate())";
			LogService.Write(sql_Temp);
			oCN.RunProc(sql_Temp, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

			DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_WorkCenter where HNumber = N'" + HNumber + "'", "Gy_WorkCenter");

			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 = "";
			foreach (ClsGy_WorkCenterSub listOne in list1)
			{
			sql3 += "insert into Gy_WorkCenterSub(HCenterID, HSourceID) Values("
			+ itemID + "," + listOne.HSourceID + ");";

			}
			LogService.Write(sql3);
			oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");

			//保存后控制=========================================
			string sql2 = "exec h_p_Gy_WorkCenter_AfterSaveCtrl " + HMaker + ",'" + 1 + "'";
			@@ -835,7 +909,16 @@
			",HCREATEORGID='" + HCREATEORGID + "'" +
			",HBarCodeForBase='" + HBarCodeForBase + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.RunProcReturn("delete from Gy_WorkCenterSub where HCenterID = " + HItemID, "Gy_WorkCenterSub");

			string sql3 = "";
			foreach(ClsGy_WorkCenterSub listOne in list1)
			{
			sql3 += "insert into Gy_WorkCenterSub(HCenterID, HSourceID) Values("
			+ HItemID + "," + listOne.HSourceID + ")";
			}

			oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
			//将上级为非末级
			oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);