~yxj/MES-WEB-API.git

			@@ -16,16 +16,14 @@
			private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			DataSet ds;

			/// <summary>
			/// 修改单据-保存按钮
			/// 新增单据-保存按钮
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_Process/EditBill")]
			[Route("Gy_Process/AddNew")]
			[HttpPost]
			//原代码用于替换子项目
			public object EditBill([FromBody] JObject oMain)
			public object AddNew([FromBody] JObject oMain)
			{
			try
			{
			@@ -33,7 +31,9 @@
			string msg1 = _value.ToString();
			//反序列化
			msg1 = "[" + msg1.ToString() + "]";

			DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl();
			DAL.ClsGy_Process_View oDeptHlp = new DAL.ClsGy_Process_View();
			List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(msg1);

			long HItemID = list[0].HItemID;
			@@ -64,47 +64,16 @@
			long HDeptID = list[0].HDeptID;
			long HProcID = list[0].HProcID;

			//判断权限
			//if (!ClsPub.Security_Log(msg5, 1, true, msg4))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有找到该功能模块！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//if (!DBUtility.ClsPub.AllowNumber(HNumber))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//if (oDept.HavSameNumber(HItemID, HNumber))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "代码重复！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//若MAINDI重复则重新获取

			//主表

			//oCN.RunProc("Update Gy_Process set " +
			// " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			// ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
			// ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
			// ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
			// " 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);


			oCN.BeginTran();
			oCN.RunProc("Update Gy_Process set " +
			" HNumber='" + HNumber + "'" +
			@@ -131,17 +100,314 @@
			",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//return true;
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			//oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//

			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "修改单据成功！";
			objJsonResult.Message = "新增单据成功！";
			//objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			///// <summary>
			///// 修改单据-保存按钮
			/////参数：string sql。
			/////返回值：object。
			///// </summary>
			//[Route("Gy_Process/EditBill")]
			//[HttpPost]
			////原代码用于替换子项目
			//public object EditBill([FromBody] JObject oMain)
			//{
			// try
			// {
			// var _value = oMain["oMain"].ToString();
			// string msg1 = _value.ToString();
			// //反序列化
			// msg1 = "[" + msg1.ToString() + "]";
			// DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl();
			// List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(msg1);

			// long HItemID = list[0].HItemID;
			// string HNumber = list[0].HNumber;
			// string HName = list[0].HName;
			// string HShortNumber = list[0].HNumber;
			// long HParentID = list[0].HParentID;
			// string HHelpCode = list[0].HHelpCode;
			// bool HTypeFlow = list[0].HTypeFlow;
			// bool HTypeCount = list[0].HTypeCount;
			// string HDeptNumber = "";
			// long HLevel = ClsPub.GetLevel(list[0].HNumber.Trim());
			// bool HEndFlag = false;
			// long HProcessID_K3 = list[0].HProcessID_K3;
			// string HBillSubType = list[0].HType;
			// bool HAutoTrunFlag = list[0].HAutoTrunFlag;
			// string HFixPrice = list[0].HFixPrice;
			// string HOverFixPrice = list[0].HOverFixPrice;
			// string HSNo = list[0].HSNo;
			// string HBarCode = list[0].HBarCode;
			// string HProcMulID = list[0].HProcMulID;
			// string HProcCheckNote = list[0].HProcCheckNote;
			// string HRemark = list[0].HRemark;
			// bool HStopflag = list[0].HStopflag;
			// string HUseFlag = list[0].HUseFlag;
			// long HEmpQty = list[0].HEmpQty;
			// string HBarCodeForBase = list[0].HBarCodeForBase;
			// long HDeptID = list[0].HDeptID;
			// long HProcID = list[0].HProcID;

			// //判断权限
			// //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
			// //{
			// // objJsonResult.code = "0";
			// // objJsonResult.count = 0;
			// // objJsonResult.Message = "没有找到该功能模块！";
			// // objJsonResult.data = null;
			// // return objJsonResult;
			// //}
			// //if (!DBUtility.ClsPub.AllowNumber(HNumber))
			// //{
			// // objJsonResult.code = "0";
			// // objJsonResult.count = 0;
			// // objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			// // objJsonResult.data = null;
			// // return objJsonResult;
			// //}
			// //if (oDept.HavSameNumber(HItemID, HNumber))
			// //{
			// // objJsonResult.code = "0";
			// // objJsonResult.count = 0;
			// // objJsonResult.Message = "代码重复！";
			// // objJsonResult.data = null;
			// // return objJsonResult;
			// //}
			// //若MAINDI重复则重新获取

			// //主表

			// //oCN.RunProc("Update Gy_Process set " +
			// // " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			// // ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
			// // ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
			// // ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
			// // " 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);


			// oCN.BeginTran();
			// oCN.RunProc("Update Gy_Process set " +
			// " HNumber='" + HNumber + "'" +
			// ",HName='" + HName + "'" +
			// ",HHelpCode='" + HHelpCode + "'" +
			// ",HShortNumber='" + HShortNumber + "'" +
			// ",HParentID= " + HParentID +
			// ",HTypeFlow= '" + HTypeFlow + "'" +
			// ",HTypeCount= '" + HTypeCount + "'" +
			// ",HDeptNumber='" + HDeptNumber + "'" +
			// ",HSNo= " + HSNo +
			// ",HLevel= " + HLevel +
			// ",HEndFlag= '" + HEndFlag + "'" +
			// ",HStopflag= '" + HStopflag + "'" +
			// ",HRemark='" + HRemark + "'" +
			// ",HDeptID= " + HDeptID +
			// ",HBarCodeForBase='" + HBarCodeForBase + "'" +
			// ",HProcessID_K3= " + HProcessID_K3 +
			// ",HBillSubType='" + HBillSubType + "'" +
			// ",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
			// ",HFixPrice= " + HFixPrice +
			// ",HOverFixPrice= " + HOverFixPrice +
			// ",HProcMulID= " + HProcMulID +
			// ",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			// //修改上级为非末级代码
			// oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			// //return true;
			// //修改子项目代码
			// //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			// //将上级为非末级
			// //oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			// //
			// oCN.Commit();
			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "修改单据成功！";
			// //objJsonResult.data = null;
			// return objJsonResult;
			// }
			// catch (Exception e)
			// {
			// oCN.RollBack();
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "Exception！" + e.Message;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			//}

			/// <summary>
			/// 保存按钮
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_Process/ModifyByID")]
			[HttpPost]
			public object ModifyByID([FromBody] JObject oMain)
			{
			try
			{
			DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl();
			DAL.ClsGy_Process_View oDeptHlp = new DAL.ClsGy_Process_View();

			var _value = oMain["oMain"].ToString();
			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();
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(msg2);

			long HItemID = list[0].HItemID;
			string HNumber = list[0].HNumber;
			string HName = list[0].HName;
			string HShortNumber = list[0].HNumber;
			long HParentID = list[0].HParentID;
			string HHelpCode = list[0].HHelpCode;
			bool HTypeFlow = list[0].HTypeFlow;
			bool HTypeCount = list[0].HTypeCount;
			string HDeptNumber = "";
			long HLevel = ClsPub.GetLevel(list[0].HNumber.Trim());
			bool HEndFlag = false;
			long HProcessID_K3 = list[0].HProcessID_K3;
			string HBillSubType = list[0].HType;
			bool HAutoTrunFlag = list[0].HAutoTrunFlag;
			string HFixPrice = list[0].HFixPrice;
			string HOverFixPrice = list[0].HOverFixPrice;
			string HSNo = list[0].HSNo;
			string HBarCode = list[0].HBarCode;
			string HProcMulID = list[0].HProcMulID;
			string HProcCheckNote = list[0].HProcCheckNote;
			string HRemark = list[0].HRemark;
			bool HStopflag = list[0].HStopflag;
			string HUseFlag = list[0].HUseFlag;
			long HEmpQty = list[0].HEmpQty;
			string HBarCodeForBase = list[0].HBarCodeForBase;
			long HDeptID = list[0].HDeptID;
			long HProcID = list[0].HProcID;
			int HUSEORGID = list[0].HUSEORGID;

			//判断权限
			//if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有找到该功能模块！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			//if (!DBUtility.ClsPub.AllowNumber(HNumber))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			// objJsonResult.data = null;
			// 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();
			oCN.RunProc("Insert into Gy_Process " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
			",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
			",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
			",HUSEORGID) " +
			" 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() + "'" +
			","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			}
			else
			{
			//若MAINDI重复则重新获取
			oCN.BeginTran();
			oCN.RunProc("Update Gy_Process set " +
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HParentID= " + HParentID +
			",HTypeFlow= '" + HTypeFlow + "'" +
			",HTypeCount= '" + HTypeCount + "'" +
			",HDeptNumber='" + HDeptNumber + "'" +
			",HSNo= " + HSNo +
			",HLevel= " + HLevel +
			",HEndFlag= '" + HEndFlag + "'" +
			",HStopflag= '" + HStopflag + "'" +
			",HRemark='" + HRemark + "'" +
			",HDeptID= " + HDeptID +
			",HBarCodeForBase='" + HBarCodeForBase + "'" +
			",HProcessID_K3= " + HProcessID_K3 +
			",HBillSubType='" + HBillSubType + "'" +
			",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
			",HFixPrice= " + HFixPrice +
			",HOverFixPrice= " + HOverFixPrice +
			",HProcMulID= " + HProcMulID +
			",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//
			oCN.Commit();
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			catch (Exception e)
			@@ -161,36 +427,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)
			{
			@@ -248,22 +525,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, true, 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))