~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;
			@@ -321,9 +322,22 @@
			string HBarCodeForBase = list[0].HBarCodeForBase;
			long HDeptID = list[0].HDeptID;
			long HProcID = list[0].HProcID;
			int HUSEORGID = list[0].HUSEORGID;

			////判断权限
			//if (!ClsPub.Security_Log(msg5, 1, false, msg4))


			long HWorkCenterID = list[0].HWorkCenterID; //工作中心

			long HBadWHID = list[0].HBadWHID; //不良仓库
			long HWasterWHID = list[0].HWasterWHID; //报废仓库
			long HBadCountDevelopWHID = list[0].HBadCountDevelopWHID; //研发不良品仓库
			long HWWBadWHID = list[0].HWWBadWHID; //委外不良仓库
			long HWWWasterWHID = list[0].HWWWasterWHID; //委外报废仓库
			long HWHID = list[0].HWHID; //良品仓库


			//判断权限
			//if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -358,12 +372,14 @@
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
			",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
			",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
			",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
			",HUSEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
			"," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
			"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
			",'" + HBarCode + "'," + HProcessID_K3 + ",'" +HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
			",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
			","+ HUSEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			@@ -394,6 +410,13 @@
			",HFixPrice= " + HFixPrice +
			",HOverFixPrice= " + HOverFixPrice +
			",HProcMulID= " + HProcMulID +
			",HWorkCenterID= " + HWorkCenterID +
			",HBadWHID= " + HBadWHID +
			",HWasterWHID= " + HWasterWHID +
			",HBadCountDevelopWHID= " + HBadCountDevelopWHID +
			",HWWBadWHID= " + HWWBadWHID +
			",HWWWasterWHID= " + HWWWasterWHID +
			",HWHID= " + HWHID +
			",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -428,12 +451,13 @@
			{
			try
			{
			//判断是否有查询权限
			List<object> columnNameList = new List<object>();
			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_Process_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限查询!";
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -448,22 +472,32 @@
			string sql = sql1 + sWhere+ " order by 工序代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.data = null;
			return objJsonResult;
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -521,19 +555,18 @@
			/// <returns></returns>
			[Route("DeltetGy_Process")]
			[HttpGet]
			public object DeltetGy_Process(string HItemID,string user)
			public object DeltetGy_Process(string HItemID, string user)
			{
			DataSet ds;
			DataSet ds1;
			string ModRightNameCheck = "Gy_Process_Delete";
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("Gy_Process_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限删除！";
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}