~yxj/MES-WEB-API.git

			@@ -275,6 +275,18 @@
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();//用户名

			//判断是否有编辑权限
			if (!DBUtility.ClsPub.Security_Log("Gy_Process_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限编辑!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//string msg3 = sArray[1].ToString();
			//string msg4 = sArray[2].ToString();
			//string msg5 = sArray[3].ToString();
			@@ -309,9 +321,15 @@
			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; //工作中心


			//判断权限
			//if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -346,12 +364,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) " +
			" 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 +
			"," + 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 + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			@@ -382,6 +402,7 @@
			",HFixPrice= " + HFixPrice +
			",HOverFixPrice= " + HOverFixPrice +
			",HProcMulID= " + HProcMulID +
			",HWorkCenterID= " + HWorkCenterID +
			",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -412,36 +433,47 @@
			/// </summary>
			[Route("Gy_Process/list")]
			[HttpGet]
			public object getProcessList(string sWhere)
			public object getProcessList(string sWhere,string user)
			{
			try
			{
			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_Process_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList " + sWhere, "h_v_Gy_ProcessList");
			ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList order by 工序代码 ", "h_v_Gy_ProcessList");
			}
			else
			{
			string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere+ " order by 工序代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			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];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -499,22 +531,21 @@
			/// <returns></returns>
			[Route("DeltetGy_Process")]
			[HttpGet]
			public object DeltetGy_Process(string HItemID)
			public object DeltetGy_Process(string HItemID, string user)
			{
			DataSet ds;
			DataSet ds1;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			//if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "审核失败！无权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.Security_Log("Gy_Process_Delete", 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))