MES-WEB-API.git

			@@ -8,13 +8,20 @@
			using System;
			using System.Collections.Generic;
			using System.Data;
			using System.IO;
			using System.Linq;
			using System.Net;
			using System.Net.Http;
			using System.Web;
			using System.Web.Http;
			using WebAPI;
			using WebAPI.Controllers.SCGL.日计划管理;
			using WebAPI.Models;
			using WebAPI.Service;
			using System.Web;
			using WebAPI.Controllers.SCGL.日计划管理;
			using System.IO;
			using SyntacticSugar.constant;

			namespace WebAPI.Controllers
			{
			@@ -81,6 +88,27 @@
			}
			}



			/// <summary>
			/// 根据时间获取产量汇报单集合
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetICMOBillWorkQtyStatus_Tmp")]
			[HttpGet]
			public object GetICMOBillWorkQtyStatus_Tmp()
			{
			DataSet ds = new DataSet();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("exec h_p_Sc_TodayWorkQtySumReport", "h_p_Sc_TodayWorkQtySumReport");
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "Sucess！";
			objjson.data = ds.Tables[0];
			return objjson;

			}

			[Route("Web/GetMAXNumPDA")]
			[HttpGet]
			public object GetMAXNumPDA(string HBillType)
			@@ -119,7 +147,69 @@
			//----------创建虚表------------------------
			DataTable dt_Main = new DataTable("Json");
			dt_Main.Columns.Add("HBillNo", typeof(string));
			dt_Main.Columns.Add("HInterID", typeof(int));
			dt_Main.Columns.Add("HInterID", typeof(Int64));
			//---------创建新行------------------------
			DataRow dr_main = dt_Main.NewRow();//创建新行
			dt_Main.Rows.Add(dr_main);//将新行加入到表中
			dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
			dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);
			//返回数据
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功";
			objjson.data = dt_Main;
			return objjson;
			}
			}
			catch (Exception e)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + e.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			[Route("Web/GetMAXNum_ProcExchange")]
			[HttpGet]
			public object GetMAXNum_ProcExchange(string HBillType)
			{
			try
			{
			string HBillNo = "";
			string sErrMsg = "";
			Int64 HInterID = 0;//显示的字段
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref sErrMsg);
			//HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref sErrMsg, true);

			DataSet ds;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("exec h_p_IF_CheckBillIDExists_WMS " + HInterID + ",'" + HBillNo + "'", "h_p_IF_CheckBillIDExists_WMS");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "存在重复单据内码或单据号的单据，不允许新增，请退出后重新登录！";
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = sErrMsg;
			objjson.data = null;
			return objjson;
			}
			else if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "1")
			{
			sErrMsg = "存在重复单据内码或单据号的单据，不允许新增，请退出后重新登录！";
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = sErrMsg;
			objjson.data = null;
			return objjson;
			}
			else
			{
			//----------创建虚表------------------------
			DataTable dt_Main = new DataTable("Json");
			dt_Main.Columns.Add("HBillNo", typeof(string));
			dt_Main.Columns.Add("HInterID", typeof(Int64));
			//---------创建新行------------------------
			DataRow dr_main = dt_Main.NewRow();//创建新行
			dt_Main.Rows.Add(dr_main);//将新行加入到表中
			@@ -150,21 +240,21 @@
			/// <returns></returns>
			[Route("Web/GetMAXNumber")]
			[HttpGet]
			public object GetMAXNumber(string HBillType,string HName,string TableName)
			public object GetMAXNumber(string HBillType, string HName, string TableName)
			{
			try
			{
			string HNumber = "";
			HNumber = DBUtility.ClsPub.CreateHNumber(HBillType,HName, TableName, ref DBUtility.ClsPub.sExeReturnInfo, true);
			HNumber = DBUtility.ClsPub.CreateHNumber(HBillType, HName, TableName, ref DBUtility.ClsPub.sExeReturnInfo, true);
			//----------创建虚表------------------------
			DataTable dt_Main = new DataTable("Json");
			dt_Main.Columns.Add("HNumber", typeof(string));


			//---------创建新行------------------------
			DataRow dr_main = dt_Main.NewRow();//创建新行
			dt_Main.Rows.Add(dr_main);//将新行加入到表中
			dr_main["HNumber"] = DBUtility.ClsPub.isStrNull(HNumber);



			if (HNumber == null)
			{
			@@ -252,7 +342,7 @@
			public object GetUser(string UserName, string PassWord, string HOrgName)
			{
			try
			{
			{
			DataSet ds = null;
			ClsCN oCnLoc = new ClsCN();
			DAL.ClsUser oUser = new DAL.ClsUser();
			@@ -321,7 +411,7 @@
			return objjson;
			}
			}
			}
			}
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "展开成功！";
			@@ -345,47 +435,57 @@
			/// <returns></returns>
			[Route("Web/GetXGPassword")]
			[HttpGet]
			public object GetXGPassword(string UserName, string oldPassword, string PassWord, string Repassword)
			public object GetXGPassword(string UserName, string oldPassword, string PassWord, string Repassword,string HCloudUserName,string HCloudUserPsd)
			{
			try
			{
			ClsCN oCn = new ClsCN();
			DataSet oDs = new DataSet();
			//==========
			oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czybm='" + UserName + "'", "Gy_Czygl");
			if (PassWord.Trim() != Repassword.Trim())

			if(PassWord!=null)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "2次密码不一致！";
			objjson.data = oDs.Tables[0];
			return objjson; ;
			}
			//===========
			if (oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "没有这个用户，不能修改密码！";
			objjson.data = null;
			return objjson; ;
			}
			else
			{
			oCn.RunProc("update Gy_Czygl set Czmm='" + ClsPub.StrToPsd(PassWord.Trim()) + "' where Czybm='" + UserName.Trim() + "'");
			oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czybm='" + UserName + "'", "Gy_Czygl");
			if (PassWord.Trim() != Repassword.Trim())
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "2次密码不一致！";
			objjson.data = oDs.Tables[0];
			return objjson; ;
			}
			//===========
			if (oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "没有这个用户，不能修改密码！";
			objjson.data = null;
			return objjson; ;
			}
			oCn.RunProc("update Gy_Czygl set Czmm='" + ClsPub.StrToPsd(PassWord.Trim()) + "',HCloudUserName = '" + HCloudUserName+ "',HCloudUserPsd = '" + HCloudUserPsd+ "' where Czybm='" + UserName.Trim() + "'");
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "* 密码修改成功！";
			objjson.data = null;
			return objjson;
			}
			else
			{
			oCn.RunProc("update Gy_Czygl set HCloudUserName = '" + HCloudUserName + "',HCloudUserPsd = '" + HCloudUserPsd + "' where Czybm='" + UserName.Trim() + "'");
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "* 金蝶云账号修改成功！";
			objjson.data = null;
			return objjson; ;
			}
			}
			catch (Exception)
			catch (Exception e)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "修改密码异常！";
			objjson.Message = "修改密码异常！" + e.ToString();
			objjson.data = null;
			return objjson; ;
			}
			@@ -474,8 +574,8 @@
			// return objJsonResult;
			//}

			string sql = "update Gy_Czygl set " +
			"HWhID = " + HWhID +
			string sql = "update Gy_Czygl set " +
			"HWhID = " + HWhID +
			", HWhName = '" + HWhName +
			"', HSecManagerID = " + HSecManagerID +
			", HSecManager = '" + HSecManager +
			@@ -1289,7 +1389,7 @@
			/// <returns></returns>
			[Route("Web/GetSouceList_Json")]
			[HttpGet]
			public object GetSouceList_Json(string HMaterID,string Value, Int64 HOrgID)
			public object GetSouceList_Json(string HMaterID, string Value, Int64 HOrgID)
			{
			sWhere = " and HStopFlag=0 and HUSEORGID =" + HOrgID + "";
			if (Value != "" && Value != null)
			@@ -1298,7 +1398,7 @@
			}
			try
			{
			string sql = "EXEC h_p_Gy_SouceViewList " + HMaterID+",'"+ sWhere + "'";
			string sql = "EXEC h_p_Gy_SouceViewList " + HMaterID + ",'" + sWhere + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Gy_SouceViewList");

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			@@ -1408,6 +1508,52 @@
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("Select HItemID,班组代码班组代码,班组名称班组 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception e)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + e.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 获取班组列表根据用户对应班组关系，获取用户对应的班组
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Web/GetGroupListByUser_Json")]
			[HttpGet]
			public object GetGroupListByUser_Json(string sWhere, string user)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			//根据用户对应班组的关系，过滤条件中增加只显示对应的班组
			DataSet dsHitemID = oCN.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser");
			sWhere = sWhere + DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]);

			DataSet ds = oCN.RunProcReturn("Select HItemID,班组代码班组代码,班组名称班组 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -1709,7 +1855,7 @@
			string sql1 = "Select HItemID,HNumber ,HName from Gy_SellStyle where HStopflag=0 and HEndFlag=1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_SellStyle");
			}
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			@@ -1736,7 +1882,7 @@
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}
			}

			/// <summary>
			@@ -2948,7 +3094,7 @@
			objJsonResult.data = null;
			return objJsonResult; ;
			}



			oCN.RunProc("delete Gy_ErrType where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			@@ -3070,6 +3216,263 @@
			return objJsonResult;
			}
			}
			#endregion

			#region 异常类型文件导入保存
			#region 异常类型文件上传
			[Route("Gy_ErrType/Gy_ErrType_Excel")]
			[HttpPost]
			public object Gy_ErrType_Excel()
			{
			try
			{
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//保存文件
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable tb2 = new DataTable("dt2");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//模板缺少列但需要从数据库中查询出来显示在页面的字段
			tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = tb2.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			tb2.Rows.Add(row);
			}


			var error = "";

			//查询工艺路线没有的列
			if (!tb2.Columns.Contains("组织代码"))
			error += "没有找到【组织代码】的标题,";

			if (!tb2.Columns.Contains("组织名称"))
			error += "没有找到【组织名称】的标题,";

			if (!tb2.Columns.Contains("异常类型"))
			error += "没有找到【异常类型名称】的标题,";

			if (!tb2.Columns.Contains("异常类型代码"))
			error += "没有找到【异常类型代码】的标题,";

			if (error.Length > 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string HProcessName = "";
			string HProcessNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HProcessName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["异常类型"].ToString());
			HProcessNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["异常类型代码"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());

			//检查物料
			int index = i + 1;

			if (HORGNumber != "")
			{

			//查询组织
			ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();

			//异常类型名称
			if (HProcessName == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,异常类型名称不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//异常类型代码
			if (HProcessNum == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,异常类型代码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织代码为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = error;
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 异常类型项目导入(保存)
			[Route("Gy_ErrType/Gy_ErrType_btnSave")]
			[HttpPost]
			public object Gy_ErrType_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_ErrType_Edit", 1, false, user))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HOrgID = item["HOrgID"].ToString();//组织ID
			string HProcessName = item["异常类型"].ToString();
			string HProcessNum = item["异常类型代码"].ToString();
			string HRemark = item["备注"].ToString();
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HProcessNum);//短代码
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			int HEndFlag = 1;//末级标志
			int HLevel = DBUtility.ClsPub.GetLevel(HProcessNum); //等级


			if (!DBUtility.ClsPub.AllowNumber(HProcessNum.Trim()))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_ErrType where HNumber='" + HProcessNum + "'", "Gy_ErrType");

			if (ds.Tables[0].Rows.Count == 0)
			{

			oCN.RunProc("Insert into " + "Gy_ErrType" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HBarCode,HUSEORGID,HCREATEORGID,HUseFlag) " +
			" Values('" + HProcessNum + "','" + HProcessName + "','" + "','" + sShortNumber + "'," + 0 +
			"," + HLevel + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + "'," + HOrgID + "," + HOrgID + ",'" + "未检测" + "')");
			}
			else
			{
			oCN.RunProc("update Gy_ErrType set HUSEORGID=" + HOrgID + ",HRemark='" + HRemark + "' where HNumber='" + HProcessNum + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = "导入成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			/// <summary>
			@@ -3816,6 +4219,208 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 检测值列表文件上传
			[Route("Gy_Inspect/Gy_Process_Excel")]
			[HttpPost]
			public json Gy_Inspect_Excel()
			{
			json res = new json();
			try
			{
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//保存文件
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable provisional = new DataTable("dt2");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = provisional.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			provisional.Rows.Add(row);
			}

			//判断列
			string error = JudgmentColumns(provisional);
			if (error.Length > 0)
			{
			res.code = "0";
			res.count = 0;
			res.Message = $"Excel模板存在错误,{error}\r\n";
			res.data = null;
			return res;
			}

			for (int i = 0; i <= provisional.Rows.Count - 1; i++)
			{
			string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["检测值代码"].ToString());
			string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["检测值名称"].ToString());
			string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["助记码"]);
			string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());
			//获取真实行数
			int line = i + 1;
			}

			res.code = "1";
			res.count = 1;
			res.Message = error;
			res.data = provisional;
			return res;
			}
			catch (Exception e)
			{
			res.code = "0";
			res.count = 0;
			res.Message = "Exception！" + e.ToString();
			res.data = null;
			return res;
			}
			}

			/// <summary>
			/// 判断列
			/// </summary>
			/// <param name="provisional"></param>
			/// <returns></returns>
			private static string JudgmentColumns(DataTable provisional)
			{
			var error = "";

			//查询没有的列
			if (!provisional.Columns.Contains("检测值代码"))
			error += "没有找到【检测值代码】的标题,";

			if (!provisional.Columns.Contains("检测值名称"))
			error += "没有找到【检测值名称】的标题,";
			return error;
			}
			#endregion

			#region 检测值列表导入(保存)
			[Route("Gy_Inspect/Gy_Process_btnSave")]
			[HttpPost]
			public object Gy_Inspect_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			string organ = sArray[2].ToString();

			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HNumber = item["检测值代码"].ToString();
			string HName = item["检测值名称"].ToString();
			string HHelpCode = item["助记码"];
			string HRemark = item["备注"].ToString();

			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			int HEndFlag = 1;//末级标志
			int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //等级


			if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_InspectValue where HNumber='" + HNumber + "'", "Gy_InspectValue");

			if (ds.Tables[0].Rows.Count == 0)
			{

			string sql = "insert into Gy_InspectValue (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
			$"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '未使用', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
			oCN.RunProc(sql);
			}
			else
			{
			oCN.RunProc("update Gy_InspectValue set HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "'where HNumber='" + HNumber + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "导入成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -5237,7 +5842,7 @@
			objJsonResult.data = null;
			return objJsonResult; ;
			}



			oCN.RunProc("delete Gy_PostSkill where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			@@ -5259,6 +5864,309 @@
			}
			#endregion


			#region 岗位技能文件导入保存
			#region 岗位技能文件上传
			[Route("Gy_PostSkill/Gy_PostSkill_Excel")]
			[HttpPost]
			public object Gy_PostSkill_Excel()
			{
			try
			{
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//保存文件
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable tb2 = new DataTable("dt2");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//模板缺少列但需要从数据库中查询出来显示在页面的字段
			tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID
			tb2.Columns.Add("HPostID", typeof(Int32));//岗位id

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = tb2.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			tb2.Rows.Add(row);
			}


			var error = "";

			//查询没有的列
			if (!tb2.Columns.Contains("组织代码"))
			error += "没有找到【组织代码】的标题,";

			if (!tb2.Columns.Contains("组织名称"))
			error += "没有找到【组织名称】的标题,";

			if (!tb2.Columns.Contains("岗位技能"))
			error += "没有找到【岗位技能】的标题,";

			if (!tb2.Columns.Contains("岗位技能代码"))
			error += "没有找到【岗位技能代码】的标题,";

			if (!tb2.Columns.Contains("岗位"))
			error += "没有找到【岗位】的标题,";

			if (!tb2.Columns.Contains("岗位代码"))
			error += "没有找到【岗位代码】的标题,";

			if (!tb2.Columns.Contains("备注"))
			error += "没有找到【备注】的标题,";

			if (!tb2.Columns.Contains("助记码"))
			error += "没有找到【助记码】的标题,";

			if (error.Length > 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string HProcessName = "";
			string HProcessNum = "";
			string HORGNumber = "";
			string HORGName = "";
			string HPostName = "";
			string HPostNumber = "";


			HProcessName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["岗位技能"].ToString());
			HProcessNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["岗位技能代码"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());
			HPostName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["岗位"].ToString());
			HPostNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["岗位代码"].ToString());

			//检查物料
			int index = i + 1;

			if (HORGNumber != "")
			{

			//查询组织
			ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
			//查询岗位
			ds = oCN.RunProcReturn("select * from Gy_Post where HNumber='" + HPostNumber + "' and Hname='" + HPostName + "' and HUSEORGID = "+ HORGid, "Gy_Post");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,岗位不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HPostID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}



			//岗位技能名称
			if (HProcessName == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,岗位技能不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//岗位技能代码
			if (HProcessNum == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,岗位技能代码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织代码为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = error;
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 岗位技能项目导入(保存)
			[Route("Gy_PostSkill/Gy_PostSkill_btnSave")]
			[HttpPost]
			public object Gy_PostSkill_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_PostSkill_Edit", 1, false, user))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HOrgID = item["HOrgID"].ToString();//组织ID
			string HPostID = item["HPostID"].ToString();//组织ID
			string HName = item["岗位技能"].ToString();
			string HNumber = item["岗位技能代码"].ToString();
			string HRemark = item["备注"].ToString();
			string HHelpCode = item["助记码"].ToString();
			string HUseFlag = "未检测";
			string HShortNumber;
			HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			if (HShortNumber.Trim() == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			int HEndFlag = 1;//末级标志
			int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //等级


			if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_PostSkill where HNumber='" + HNumber + "'", "Gy_PostSkill");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_PostSkill" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID,HPostID,HProcID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + 0 +
			"," + HLevel + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + HUseFlag + "','" + user + "','" + HOrgID + "','" + HPostID + "','" + 0 + "')");


			}
			else
			{
			oCN.RunProc("Update " + "Gy_PostSkill" + " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HModifyTime='" + DateTime.Now + "'" +
			",HUSEORGID='" + HOrgID + "'" +
			",HModifyEmp ='" + user + "'" +
			",HPostID ='" + HPostID + "'" +
			",HRemark= '" + HRemark + "' Where HNumber='" + HNumber + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = "导入成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			#region 岗位设置列表/保存/编辑/删除方法
			/// <summary>
			@@ -5540,6 +6448,279 @@
			}
			#endregion

			#region 岗位文件导入保存
			#region 岗位文件上传
			[Route("Gy_Post/Gy_Post_Excel")]
			[HttpPost]
			public object Gy_Post_Excel()
			{
			try
			{
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//保存文件
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable tb2 = new DataTable("dt2");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//模板缺少列但需要从数据库中查询出来显示在页面的字段
			tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = tb2.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			tb2.Rows.Add(row);
			}


			var error = "";

			//查询没有的列
			if (!tb2.Columns.Contains("组织代码"))
			error += "没有找到【组织代码】的标题,";

			if (!tb2.Columns.Contains("组织名称"))
			error += "没有找到【组织名称】的标题,";

			if (!tb2.Columns.Contains("岗位"))
			error += "没有找到【岗位名称】的标题,";

			if (!tb2.Columns.Contains("岗位代码"))
			error += "没有找到【岗位代码】的标题,";

			if (!tb2.Columns.Contains("备注"))
			error += "没有找到【备注】的标题,";

			if (!tb2.Columns.Contains("助记码"))
			error += "没有找到【助记码】的标题,";

			if (error.Length > 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string HProcessName = "";
			string HProcessNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HProcessName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["岗位"].ToString());
			HProcessNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["岗位代码"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());

			//检查物料
			int index = i + 1;

			if (HORGNumber != "")
			{

			//查询组织
			ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();

			//岗位名称
			if (HProcessName == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,岗位名称不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//岗位代码
			if (HProcessNum == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,岗位代码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织代码为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = error;
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 岗位项目导入(保存)
			[Route("Gy_Post/Gy_Post_btnSave")]
			[HttpPost]
			public object Gy_Post_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_Post_Edit", 1, false, user))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HOrgID = item["HOrgID"].ToString();//组织ID
			string HName = item["岗位"].ToString();
			string HNumber = item["岗位代码"].ToString();
			string HRemark = item["备注"].ToString();
			string HHelpCode = item["助记码"].ToString();
			string HUseFlag = "未检测";
			string HShortNumber;
			HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			if (HShortNumber.Trim() == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			int HEndFlag = 1;//末级标志
			int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //等级


			if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_Post where HNumber='" + HNumber + "'", "Gy_Post");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_Post" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + 0 +
			"," + HLevel + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + HUseFlag + "','" + user + "','" + HOrgID + "')");


			}
			else
			{
			oCN.RunProc("Update " + "Gy_Post" + " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HModifyTime='" + DateTime.Now + "'" +
			",HUSEORGID='" + HOrgID + "'" +
			",HModifyEmp ='" + user + "'" +
			",HRemark= '" + HRemark + "' Where HNumber='" + HNumber + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = "导入成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			#region 调拨类型设置列表/保存/编辑/删除方法
			/// <summary>
			/// 保存调拨类型
			@@ -5584,7 +6765,7 @@
			WebAPI.DLL.ClsGy_StockMoveStyle_Ctl oBill = new WebAPI.DLL.ClsGy_StockMoveStyle_Ctl();
			List<Model.ClsGy_StockMoveStyle_Model> lsmain = new List<Model.ClsGy_StockMoveStyle_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", "");
			msg1 = msg1.Replace("\n", "");
			lsmain = oListModels.getObjectByJson_Gy_StockMoveStyle(msg1);
			foreach (Model.ClsGy_StockMoveStyle_Model oItem in lsmain)
			{
			@@ -7500,6 +8681,288 @@
			}
			#endregion

			#region 工艺参数分类设置列表/保存/编辑/删除方法
			/// <summary>
			/// 工艺参数分类保存
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveGy_TechnologyTypeList")]
			[HttpPost]
			public object SaveGy_TechnologyTypeList([FromBody] JObject msg)
			{
			DataSet ds;
			var _value = msg["msg"].ToString();
			string msg3 = _value.ToString();
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg2 = sArray[1].ToString();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_Technology_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_TechnologyParameterClass ", "Gy_TechnologyParameterClass");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			{
			//HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
			var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
			maxid += 1;
			HItemID = maxid;
			}
			ListModels oListModels = new ListModels();
			try
			{
			WebAPI.DLL.ClsGy_TechnologyParameterType_Ctl oBill = new WebAPI.DLL.ClsGy_TechnologyParameterType_Ctl();
			List<Model.ClsGy_TechnologyParameterType_Model> lsmain = new List<Model.ClsGy_TechnologyParameterType_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", "");
			lsmain = oListModels.getObjectByJson_Gy_TechnologyParameterType(msg1);
			foreach (Model.ClsGy_TechnologyParameterType_Model oItem in lsmain)
			{
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (oItem.HName.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！名称不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_TechnologyParameterClass where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_TechnologyParameterClass");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//新增时判断
			if (oItem.HItemID == 0)
			{
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			if (sParent.Trim() == "")
			{
			oBill.oModel.HParentID = 0;
			}
			else
			{
			if (oBill.HavParentCode(sParent.Trim(), HItemID))
			{
			oBill.oModel.HParentID = oBill.oModel.HItemID;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			}
			else//编辑时判断
			{
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			if (sParent.Trim() == "")
			{
			oBill.oModel.HParentID = 0;
			}
			else
			{
			if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
			{
			oBill.oModel.HParentID = oBill.oModel.HItemID;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			}
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oItem.HMakeEmp = msg2; //创建人

			oBill.oModel = oItem;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 工艺参数分类删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_TechnologyType")]
			[HttpGet]
			public object DeltetGy_TechnologyType(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_Technology_Drop", 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))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务
			ds = oCN.RunProcReturn("select * from Gy_TechnologyParameterClass where HItemID=" + HItemID, "Gy_TechnologyParameterClass");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}


			oCN.RunProc("delete Gy_TechnologyParameterClass where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 工艺品参数分类获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_TechnologyTypeDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_TechnologyType(string HID)
			{
			var model = LuBaoSevice.GetGy_TechnologyType(HID);
			return model;
			}


			#endregion

			#region 客户分类设置列表/保存/编辑/删除方法
			/// <summary>
			/// 客户分类保存
			@@ -8101,7 +9564,7 @@
			ListModels oListModels = new ListModels();
			try
			{


			WebAPI.DLL.ClsGy_ProjectMoney_Ctl oBill = new WebAPI.DLL.ClsGy_ProjectMoney_Ctl();
			List<Model.ClsGy_ProjectMoney_Model> lsmain = new List<Model.ClsGy_ProjectMoney_Model>();
			msg1 = msg1.Replace("\\", "");
			@@ -8310,7 +9773,7 @@
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务


			ds = oCN.RunProcReturn("select * from Gy_ProjectMoney where HItemID=" + HItemID, "Gy_ProjectMoney");
			if (ds.Tables[0].Rows.Count > 0)
			{
			@@ -8402,7 +9865,7 @@
			ListModels oListModels = new ListModels();
			try
			{


			WebAPI.DLL.ClsGy_ErrMsgBackType_Ctl oBill = new WebAPI.DLL.ClsGy_ErrMsgBackType_Ctl();
			List<Model.ClsGy_ErrMsgBackType_Model> lsmain = new List<Model.ClsGy_ErrMsgBackType_Model>();
			msg1 = msg1.Replace("\\", "");
			@@ -8660,6 +10123,262 @@
			return objJsonResult;
			}
			}
			#endregion

			#region 异常反馈类型文件导入保存
			#region 异常反馈类型文件上传
			[Route("Gy_ErrMsgBackType/Gy_ErrMsgBackType_Excel")]
			[HttpPost]
			public object Gy_ErrMsgBackType_Excel()
			{
			try
			{
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//保存文件
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable tb2 = new DataTable("dt2");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//模板缺少列但需要从数据库中查询出来显示在页面的字段
			tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = tb2.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			tb2.Rows.Add(row);
			}


			var error = "";

			//查询工艺路线没有的列
			if (!tb2.Columns.Contains("组织代码"))
			error += "没有找到【组织代码】的标题,";

			if (!tb2.Columns.Contains("组织名称"))
			error += "没有找到【组织名称】的标题,";

			if (!tb2.Columns.Contains("异常反馈类型"))
			error += "没有找到【异常反馈类型名称】的标题,";

			if (!tb2.Columns.Contains("异常反馈类型代码"))
			error += "没有找到【异常反馈类型代码】的标题,";

			if (error.Length > 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string HProcessName = "";
			string HProcessNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HProcessName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["异常反馈类型"].ToString());
			HProcessNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["异常反馈类型代码"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());

			//检查物料
			int index = i + 1;

			if (HORGNumber != "")
			{

			//查询组织
			ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();

			//异常类型名称
			if (HProcessName == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,异常反馈类型名称不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//异常类型代码
			if (HProcessNum == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,异常反馈类型代码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织代码为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = error;
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 异常反馈项目导入(保存)
			[Route("Gy_ErrMsgBackType/Gy_ErrMsgBackType_btnSave")]
			[HttpPost]
			public object Gy_ErrMsgBackType_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_ErrType_Edit", 1, false, user))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HOrgID = item["HOrgID"].ToString();//组织ID
			string HProcessName = item["异常反馈类型"].ToString();
			string HProcessNum = item["异常反馈类型代码"].ToString();
			string HRemark = item["备注"].ToString();
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HProcessNum);//短代码
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			int HEndFlag = 1;//末级标志
			int HLevel = DBUtility.ClsPub.GetLevel(HProcessNum); //等级


			if (!DBUtility.ClsPub.AllowNumber(HProcessNum.Trim()))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_ErrMsgBackType where HNumber='" + HProcessNum + "'", "Gy_ErrMsgBackType");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_ErrMsgBackType " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HProcessNum + "','" + HProcessName + "','" + "','" + sShortNumber + "'," + 0 +
			"," + HLevel + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + HOrgID + "')");
			}
			else
			{
			oCN.RunProc("update Gy_ErrMsgBackType set HUSEORGID=" + HOrgID + ",HRemark='" + HRemark + "' where HNumber='" + HProcessNum + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = "导入成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			#region 不良现象设置列表/保存/编辑/删除方法
			@@ -9565,6 +11284,274 @@
			}
			#endregion

			#region 防错装置文件导入保存
			#region 防错装置文件上传
			[Route("Gy_PreventErrMould/Gy_PreventErrMould_Excel")]
			[HttpPost]
			public object Gy_PreventErrMould_Excel()
			{
			try
			{
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//保存文件
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable tb2 = new DataTable("dt2");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//模板缺少列但需要从数据库中查询出来显示在页面的字段
			tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = tb2.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			tb2.Rows.Add(row);
			}


			var error = "";

			//查询没有的列
			if (!tb2.Columns.Contains("组织代码"))
			error += "没有找到【组织代码】的标题,";

			if (!tb2.Columns.Contains("组织名称"))
			error += "没有找到【组织名称】的标题,";

			if (!tb2.Columns.Contains("防错装置名称"))
			error += "没有找到【防错装置名称】的标题,";

			if (!tb2.Columns.Contains("防错装置代码"))
			error += "没有找到【防错装置代码】的标题,";
			if (!tb2.Columns.Contains("备注"))
			error += "没有找到【备注】的标题,";
			if (!tb2.Columns.Contains("助记码"))
			error += "没有找到【助记码】的标题,";

			if (error.Length > 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string HProcessName = "";
			string HProcessNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HProcessName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["防错装置名称"].ToString());
			HProcessNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["防错装置代码"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());

			//检查物料
			int index = i + 1;

			if (HORGNumber != "")
			{

			//查询组织
			ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();

			//防错装置名称
			if (HProcessName == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,防错装置名称不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//防错装置代码
			if (HProcessNum == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,防错装置代码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织代码为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = error;
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 防错装置项目导入(保存)
			[Route("Gy_PreventErrMould/Gy_PreventErrMould_btnSave")]
			[HttpPost]
			public object Gy_PreventErrMould_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_PreventErrMould_Edit", 1, false, user))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HOrgID = item["HOrgID"].ToString();//组织ID
			string HName = item["防错装置名称"].ToString();
			string HNumber = item["防错装置代码"].ToString();
			string HRemark = item["备注"].ToString();
			string HHelpCode = item["助记码"].ToString();
			string HShortNumber;
			HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			if (HShortNumber.Trim() == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			int HEndFlag = 1;//末级标志
			int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //等级


			if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_PreventErrMould where HNumber='" + HNumber + "'", "Gy_PreventErrMould");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_PreventErrMould" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + 0 +
			"," + HLevel + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + HOrgID + "')");
			}
			else
			{
			oCN.RunProc("Update " + "Gy_PreventErrMould" + " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HModifyTime='" + DateTime.Now + "'" +
			",HUSEORGID='" + HOrgID + "'" +
			",HModifyEmp ='" + user + "'" +
			",HRemark= '" + HRemark + "' Where HNumber='" + HNumber + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = "导入成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			#region 防错装置设置列表/保存/编辑/删除方法
			/// <summary>
			/// 防错装置保存
			@@ -9816,7 +11803,7 @@
			}
			oCN.BeginTran();//开始事务



			oCN.RunProc("delete Gy_PreventErrMould where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			@@ -10336,7 +12323,7 @@
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_CheckNoteItem_Drop", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("Gy_CheckNoteItem_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -10374,6 +12361,641 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 启动检查项目文件导入保存
			#region 启动检查项目文件上传
			[Route("Gy_CheckNoteItem/Gy_CheckNoteItem_Excel")]
			[HttpPost]
			public object Gy_CheckNoteItem_Excel()
			{
			try
			{
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//保存文件
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable tb2 = new DataTable("dt2");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//模板缺少列但需要从数据库中查询出来显示在页面的字段
			tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = tb2.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			tb2.Rows.Add(row);
			}


			var error = "";

			//查询没有的列
			if (!tb2.Columns.Contains("组织代码"))
			error += "没有找到【组织代码】的标题,";

			if (!tb2.Columns.Contains("组织名称"))
			error += "没有找到【组织名称】的标题,";

			if (!tb2.Columns.Contains("启动检查项目名称"))
			error += "没有找到【启动检查项目名称】的标题,";

			if (!tb2.Columns.Contains("启动检查项目代码"))
			error += "没有找到【启动检查项目代码】的标题,";

			if (!tb2.Columns.Contains("备注"))
			error += "没有找到【备注】的标题,";

			if (!tb2.Columns.Contains("助记码"))
			error += "没有找到【助记码】的标题,";

			if (error.Length > 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string HProcessName = "";
			string HProcessNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HProcessName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["启动检查项目名称"].ToString());
			HProcessNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["启动检查项目代码"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());

			//检查物料
			int index = i + 1;

			if (HORGNumber != "")
			{

			//查询组织
			ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();

			//启动检查项目名称
			if (HProcessName == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,启动检查项目名称不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//启动检查项目代码
			if (HProcessNum == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,启动检查项目代码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,组织代码为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = error;
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 启动检查项目项目导入(保存)
			[Route("Gy_CheckNoteItem/Gy_CheckNoteItem_btnSave")]
			[HttpPost]
			public object Gy_CheckNoteItem_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_CheckNoteItem_Edit", 1, false, user))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HOrgID = item["HOrgID"].ToString();//组织ID
			string HName = item["启动检查项目名称"].ToString();
			string HNumber = item["启动检查项目代码"].ToString();
			string HRemark = item["备注"].ToString();
			string HHelpCode = item["助记码"].ToString();
			string HShortNumber;
			HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			if (HShortNumber.Trim() == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			int HEndFlag = 1;//末级标志
			int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //等级
			string HUseFlag = "未检测";

			if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_CheckNoteItem where HNumber='" + HNumber + "'", "Gy_CheckNoteItem");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_CheckNoteItem" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID,HCheckPostID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + 0 +
			"," + HLevel + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + HUseFlag + "','" + user + "','" + HOrgID + "','" + 0 + "')");


			}
			else
			{
			oCN.RunProc("Update " + "Gy_CheckNoteItem" + " set " +

			"HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HModifyTime='" + DateTime.Now + "'" +
			",HUSEORGID='" + HOrgID + "'" +
			",HModifyEmp ='" + user + "'" +
			",HRemark= '" + HRemark + "' Where HNumber='" + HNumber + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = "导入成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			#region 休息日设置列表/保存/编辑/删除方法
			/// <summary>
			/// 休息日保存
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveGy_RestDayList")]
			[HttpPost]
			public object SaveGy_RestDayList([FromBody] JObject msg)
			{
			DataSet ds;
			var _value = msg["msg"].ToString();
			string msg3 = _value.ToString();
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg2 = sArray[1].ToString();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_RestDay ", "Gy_RestDay");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			{
			//HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
			var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
			maxid += 1;
			HItemID = maxid;
			}
			ListModels oListModels = new ListModels();
			try
			{

			WebAPI.DLL.ClsGy_RestDay_Ctl oBill = new WebAPI.DLL.ClsGy_RestDay_Ctl();
			List<Model.ClsGy_RestDay_Model> lsmain = new List<Model.ClsGy_RestDay_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", "");
			lsmain = oListModels.getObjectByJson_Gy_RestDay(msg1);
			foreach (Model.ClsGy_RestDay_Model oItem in lsmain)
			{
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (oItem.HName.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！名称不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oItem.HMakeEmp = msg2; //创建人
			DayOfWeek dayOfWeek = oItem.HRestDay.DayOfWeek;

			// 定义星期几的中文映射关系
			Dictionary<DayOfWeek, string> chineseDayOfWeek = new Dictionary<DayOfWeek, string>
			{
			{ DayOfWeek.Sunday, "星期日" },
			{ DayOfWeek.Saturday, "星期六" }
			};

			// 获取中文星期几名称
			oItem.HWeekDay = chineseDayOfWeek[dayOfWeek];
			oBill.oModel = oItem;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！数据已存在!";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 休息日保存
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveSumGy_RestDayList")]
			[HttpPost]
			public object SaveSumGy_RestDayList([FromBody] JObject msg)
			{
			DataSet ds;
			var _value = msg["msg"].ToString();
			string msg3 = _value.ToString();
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg2 = sArray[1].ToString();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			JObject msgObj = JObject.Parse(msg1);
			string HYear = msgObj["HYear"].ToString();
			string HNumber1 = msgObj["HDeptNumber"].ToString()+'-' + msgObj["HOrgNumber"].ToString();
			string HName1 = msgObj["HDeptName"].ToString()+'-'+msgObj["HOrgName"].ToString();
			string HOrgID = msgObj["HOrgID"].ToString();
			string HDeptID = msgObj["HDeptID"].ToString();
			bool HStopflag = bool.Parse(msgObj["HStopflag"].ToString());
			string HRemark= msgObj["HRemark"].ToString();
			string HUSEORGID= msgObj["HUSEORGID"].ToString();
			string HHelpCode= msgObj["HHelpCode"].ToString();
			string HMakeEmp = msg2; //创建人
			bool Sunday = Convert.ToBoolean(msgObj["Sunday"]);
			bool Saturday = Convert.ToBoolean(msgObj["Saturday"]);
			List<Tuple<DateTime, string>> sundaysInYear = GetSundaysInYear(Convert.ToInt32(HYear), Sunday, Saturday);

			foreach (var oItem in sundaysInYear)
			{
			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_RestDay ", "Gy_RestDay");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			{
			//HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
			var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
			maxid += 1;
			HItemID = maxid;
			}
			DateTime HRestDay = oItem.Item1;
			string HWeekDay = oItem.Item2; // 获取星期字符串
			string HDate = oItem.Item1.ToString("yyyyMMdd");
			string HNumber = "";
			string HName = "";
			HNumber = HNumber1 + '-' + HDate;

			HName = HName1 + '-' + HDate;
			//先查看数据库有没有
			ds = oCN.RunProcReturn("select * from Gy_RestDay where HRestDay='" + HRestDay + "' and HOrgID='" + HOrgID + "' and HDeptID='" + HDeptID + "'", "Gy_RestDay");
			if (ds.Tables[0].Rows.Count<1)
			{
			oCN.RunProc("Insert into Gy_RestDay " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID," +
			"HOrgID,HDeptID,HRestDay,HWeekDay) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "',''," + 0 +
			"," + 0 + "," + 0 + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + DateTime.Now + "','" + HUSEORGID + "',' 未检测','" + HMakeEmp + "','" + HUSEORGID + "'" +
			",'" + HOrgID.ToString() + "','" + HDeptID.ToString() + "','" + HRestDay.ToString() + "','" + HWeekDay.ToString() + "')");
			}
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			/// <summary>
			/// 休息日获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_RestDayDetailEdit")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_RestDayDetailEdit(string HID)
			{
			var model = LuBaoSevice.GetGy_RestDayDetailEdit(HID);
			return model;
			}

			/// <summary>
			/// 休息日获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_RestDayDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_RestDayDetail(string HName)
			{
			var model = LuBaoSevice.GetGy_RestDayDetail(HName);
			return model;
			}

			/// <summary>
			/// 休息日删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_RestDay")]
			[HttpGet]
			public object DeltetGy_RestDay(string HItemID, string user)
			{
			DataSet ds;
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_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))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务


			oCN.RunProc("delete Gy_RestDay where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			//获取一年中的周六,周日或者两个同时获取
			public List<Tuple<DateTime, string>> GetSundaysInYear(int HYear, bool Sunday,bool Saturday)
			{
			List<Tuple<DateTime, string>> Days = new List<Tuple<DateTime, string>>();
			DateTime startDate = new DateTime(HYear, 1, 1);
			DateTime endDate = new DateTime(HYear, 12, 31);
			//星期天勾选
			if (Sunday && !Saturday)
			{
			while (startDate <= endDate)
			{
			if (startDate.DayOfWeek == DayOfWeek.Sunday)
			{
			Days.Add(Tuple.Create(startDate, "星期天"));
			}
			startDate = startDate.AddDays(1);
			}
			}
			//星期六勾选
			else if (!Sunday && Saturday)
			{
			while (startDate <= endDate)
			{
			if (startDate.DayOfWeek == DayOfWeek.Saturday)
			{
			Days.Add(Tuple.Create(startDate, "星期六"));
			}
			startDate = startDate.AddDays(1);
			}
			}
			else if (Sunday && Saturday)
			{
			while (startDate <= endDate)
			{
			if (startDate.DayOfWeek == DayOfWeek.Saturday \|\| startDate.DayOfWeek == DayOfWeek.Sunday)
			{
			string weekdayChinese;
			if (startDate.DayOfWeek == DayOfWeek.Sunday)
			{
			weekdayChinese = "星期天";
			Days.Add(Tuple.Create(startDate, weekdayChinese));
			}
			else if (startDate.DayOfWeek == DayOfWeek.Saturday)
			{
			weekdayChinese = "星期六";
			Days.Add(Tuple.Create(startDate, weekdayChinese));
			}
			}
			startDate = startDate.AddDays(1);
			}
			}
			return Days;
			}

			//返回的字段
			public class DayOfWeekInfo
			{
			public DateTime Date { get; set; }
			public string DayOfWeekText { get; set; }
			}
			#endregion

			@@ -10665,10 +13287,44 @@
			return objjson; ;
			}
			}



			#endregion

			/// <summary>
			/// 获取基本信息
			/// </summary>
			/// <returns></returns>
			[Route("Web/BaseInfo")]
			[HttpGet]
			public object GetBaseInfo()
			{
			try
			{
			ds = oCN.RunProcReturn("select * from xt_BaseInfo", "xt_BaseInfo");
			if (ds is null)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}catch(Exception e)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + e.Message;
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 获取职务列表
			@@ -11497,7 +14153,7 @@
			/// <returns></returns>
			[Route("Web/GetSc_ICMOBillListView3")]
			[HttpGet]
			public object GetSc_ICMOBillListView3(string ICMOBill, int OrganizationID,int HSourceID)
			public object GetSc_ICMOBillListView3(string ICMOBill, int OrganizationID, int HSourceID)
			{
			if (ICMOBill != "")
			{
			@@ -11552,7 +14208,7 @@
			[HttpGet]
			public object GetSc_ProcessExchangeBillListView(string ICMOBill, int OrganizationID)
			{
			if (ICMOBill != "")
			if (ICMOBill != "" & ICMOBill != null)
			{
			sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%' ";
			}
			@@ -11561,7 +14217,7 @@
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 单据号 desc,hsubid ", "h_v_Sc_ProcessExchangeBillList");
			ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 单据号 desc,hsubid", "h_v_Sc_ProcessExchangeBillList");
			}
			else
			{
			@@ -11865,7 +14521,7 @@
			/// <returns></returns>
			[Route("Web/GetCheckItemByCheckProjectID")]
			[HttpGet]
			public object GetCheckItemByCheckProjectID(int CheckProjectID,int HBatchQty)
			public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty)
			{
			if (CheckProjectID <= 0)
			{
			@@ -11983,19 +14639,24 @@
			List<object> list = new List<object>();
			DataSet ds2;
			DataSet ds1;
			string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
			from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
			left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
			left join Gy_Employee e on e.HItemID=t.HManagerID
			where a.HInterID=" + MouldMaintainRuleID);

			string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
			left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
			left join h_v_IF_Material m on b.HMaterID=m.HItemID
			left join h_v_IF_Unit u on b.HUnitID=u.HItemID
			where a.HInterID=" + MouldMaintainRuleID);
			ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//保养
			ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
			// string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
			// from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
			// left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
			// left join Gy_Employee e on e.HItemID=t.HManagerID
			// where a.HInterID=" + MouldMaintainRuleID);

			// string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
			//left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
			// left join h_v_IF_Material m on b.HMaterID=m.HItemID
			//left join h_v_IF_Unit u on b.HUnitID=u.HItemID
			// where a.HInterID=" + MouldMaintainRuleID);

			string sql1 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub_Item where hmainid=" + MouldMaintainRuleID);
			string sql2 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub where hmainid=" + MouldMaintainRuleID);

			ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub_Item");//保养
			ds2 = oCN.RunProcReturn(sql2, "h_v_Sc_MouldMaintainRuleBillSub");//配件
			list.Add(ds1.Tables[0]);
			list.Add(ds2.Tables[0]);
			objJsonResult.code = "0";
			@@ -12107,6 +14768,61 @@
			return objjson;
			}
			}

			#region 条码主档分页列表
			[Route("Gy_BarCodeBillList/page")]
			[HttpGet]
			public json Gy_BarCodeBillListPage(string sWhere, string user, int page, int size)
			{
			DataSet ds;
			json res = new json();
			try
			{
			List<object> columnNameList = new List<object>();
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_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("exec h_p_IF_BarCodeBillList " + page + "," + size + ",''", "h_p_IF_BarCodeBillList");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_BarCodeBillList");
			}

			//添加列名
			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列对象的列名
			}

			res.code = CodeConstant.SUCCEED;
			res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			res.Message = "Sucess！";
			res.list = columnNameList;
			res.data = ds.Tables[0];
			return res;
			}
			catch (Exception e)
			{
			res.code = CodeConstant.FAIL;
			res.count = CountConstant.FAIL;
			res.Message = "Exception！" + e.ToString();
			res.data = null;
			return res;
			}
			}
			#endregion

			/// <summary>
			/// 根据设备保养规程显示设备保养规程项目
			/// </summary>
			@@ -12129,19 +14845,22 @@
			List<object> list = new List<object>();
			DataSet ds2;
			DataSet ds1;
			string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
			from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
			left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
			left join Gy_Employee e on e.HItemID=t.HManagerID
			where a.HInterID=" + EquipProjectID);
			string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
			left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
			left join h_v_IF_Material m on b.HMaterID=m.HItemID
			left join h_v_IF_Unit u on b.HUnitID=u.HItemID
			where a.HInterID=" + EquipProjectID);
			// string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
			// from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
			// left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
			// left join Gy_Employee e on e.HItemID=t.HManagerID
			// where a.HInterID=" + EquipProjectID);
			// string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
			//left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
			// left join h_v_IF_Material m on b.HMaterID=m.HItemID
			//left join h_v_IF_Unit u on b.HUnitID=u.HItemID
			// where a.HInterID=" + EquipProjectID);

			ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//保养
			ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
			string sql1 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList where HInterID=" + EquipProjectID);
			string sql2 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleSub where hmainid=" + EquipProjectID);

			ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleBillList");//保养
			ds2 = oCN.RunProcReturn(sql2, "h_v_Sb_EquipMaintainRuleSub");//配件
			list.Add(ds1.Tables[0]);
			list.Add(ds2.Tables[0]);
			objJsonResult.code = "0";
			@@ -12220,7 +14939,7 @@
			/// <returns></returns>
			[Route("Web/GetItemByEquipFile")]
			[HttpGet]
			public object GetItemByEquipFile(int EquipProjectID,string Type,string HDate)
			public object GetItemByEquipFile(int EquipProjectID, string Type, string HDate)
			{
			if (EquipProjectID <= 0)
			{
			@@ -12258,6 +14977,14 @@
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败,查无数据" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "该设备有多个计划单或点检规程,手动选着" ;
			objjson.data = null;
			return objjson;
			}
			@@ -12302,25 +15029,36 @@
			switch (Type)
			{
			case "DJ":
			HView = "h_v_QJ_GetDotCheckItemList";
			break;
			HView = "h_v_Sc_MouldDotCheckPlanBillList";
			break;
			case "BY":
			HView = "h_v_Sc_MouldMaintainPlanBillList";
			break;
			default:
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "设备模块类型错误！";
			objjson.Message = "模具模块类型错误！";
			objjson.data = null;
			return objjson;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
			string sql = string.Format(@"Exec h_p_Sb_GetCheckItem_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
			string sql = string.Format(@"Exec h_p_Sb_GetCheckItemMouldFile_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
			ds = oCN.RunProcReturn(sql, HView);
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败,查无数据" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "该模具有多个计划单,手动选着";
			objjson.data = null;
			return objjson;
			}
			@@ -12361,8 +15099,8 @@
			}
			try
			{

			string sql = string.Format(@"select * from h_v_QJ_GetDotCheckItemList where 点检计划ID = " + HInterID );

			string sql = string.Format(@"select * from h_v_QJ_GetDotCheckItemList where 点检计划ID = " + HInterID);
			ds = oCN.RunProcReturn(sql, "h_v_QJ_GetDotCheckItemList");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			@@ -12397,8 +15135,8 @@
			/// <returns></returns>
			[Route("Web/GetEquipmentBillsList")]
			[HttpGet]
			public object GetEquipmentBillsList(string sWhere, string Type,string user)
			{
			public object GetEquipmentBillsList(string sWhere, string Type, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			@@ -12419,6 +15157,9 @@
			break;
			case "YS":
			HView = "h_v_Sb_EquipRepairCheckBillList";
			break;
			case "QD":
			HView = "h_v_Sb_EquipRepairSignBillList";
			break;
			default:
			objjson.code = "0";
			@@ -12495,13 +15236,8 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
			b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a
			left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
			left join Gy_DotCheck c on c.HItemID=b.HDotCheckItemID
			left join Gy_Employee e on e.HItemID=b.HManagerID
			where a.HInterID=" + HDotCheckRuleInterID);
			ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
			string sql = string.Format(@"select * from h_v_Sb_EquipDotCheckRuleBillList_PDA where HInterID=" + HDotCheckRuleInterID);
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleBillList_PDA");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -12529,6 +15265,149 @@
			}
			}

			/// <summary>
			/// 根据设备保养规程显示设备保养程项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetMaintainItemByMaintainRuleID")]
			[HttpGet]
			public object GetMaintainItemByMaintainRuleID(int HEquipMaintainRuleInterID)
			{
			if (HEquipMaintainRuleInterID <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "设备保养规程未选择";
			objjson.data = null;
			return objjson;
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList_PDA where HInterID=" + HEquipMaintainRuleInterID);
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleBillList_PDA");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 根据器具点检规程显示器具点检程项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetDotCheckRuleItemByDotCheckRuleID/Mould")]
			[HttpGet]
			public object GetDotCheckRuleItemByDotCheckRuleIDForMould(int HDotCheckRuleInterID)
			{
			if (HDotCheckRuleInterID <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "器具点检规程未选择";
			objjson.data = null;
			return objjson;
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList_PDA where HInterID=" + HDotCheckRuleInterID);
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillList_PDA");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 根据器具保养规程显示器具保养程项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetMaintainItemByMaintainRuleID/Mould")]
			[HttpGet]
			public object GetMaintainItemByMaintainRuleIDForMould(int HMouldMaintainRuleInterID)
			{
			if (HMouldMaintainRuleInterID <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "器具保养规程未选择";
			objjson.data = null;
			return objjson;
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = string.Format(@"select * from h_v_Sb_MouldMaintainRuleBillList_PDA where HInterID=" + HMouldMaintainRuleInterID);
			ds = oCN.RunProcReturn(sql, "h_v_Sb_MouldMaintainRuleBillList_PDA");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 获取维修项目列表
			@@ -12661,26 +15540,26 @@
			/// <returns></returns>
			[Route("Web/GetHSourceBillType")]
			[HttpGet]
			public object GetHSourceBillType(string HName,int Num)
			public object GetHSourceBillType(string HName, int Num)
			{
			try
			{
			ClsCN oCn = new ClsCN();
			DataSet oDs = new DataSet();
			//有的单子源单分为红蓝单 0代表蓝单 1代表红单
			if (Num==0)
			if (Num == 0)
			{ //源单为蓝单
			oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "'and HRedBlueFlag ='"+ Num+"' ", "Xt_BillSourceSet");
			oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "'and HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
			}
			else if (Num==1)
			else if (Num == 1)
			{ //源单为红单
			oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "' and HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
			}
			else if(Num==2)
			else if (Num == 2)
			{ //不分红蓝单
			oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "'", "Xt_BillSourceSet");
			}


			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功！";
			@@ -12755,9 +15634,9 @@
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //数据库操作工具
			string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
			ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //查询当前用户的自定义菜单数据
			if (ds.Tables[0]==null \|\| ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
			if (ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
			{
			sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition ";
			sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu");
			}

			@@ -12880,7 +15759,7 @@
			List<MenuInit> menuInitList = new List<MenuInit>(); //用以获取Gy_Menu_1中的所有菜单信息，以及对应节点是否被选中需要加载显示

			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where HType = '" +HType + "' Order by HItemID ", "Gy_Menu"); //获取Gy_Menu_1中的所有菜单信息，用于为menuInitList列表充实数据
			ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HItemID ", "Gy_Menu"); //获取Gy_Menu_1中的所有菜单信息，用于为menuInitList列表充实数据

			DataSet ds1 = new DataSet();
			for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //将Gy_Menu_1中的菜单信息及选中情况保存到menuInitList列表中，
			@@ -12977,16 +15856,16 @@

			//设置数据库操作的回滚点，若在提交前报错，则回滚到该点，期间操作取消
			oCN.BeginTran();


			//删除当前用户的自定义数据
			string sql = "delete from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HTypes + "'";
			oCN.RunProc(sql);

			//插入当前用户最新的自定义数据
			for(int i=0;i< saveDataList.Count; i++)
			for (int i = 0; i < saveDataList.Count; i++)
			{
			sql = "select * from Gy_Menu_1 where HItemID = '" + saveDataList[i].HItemID + "'";
			ds = oCn.RunProcReturn(sql,"Gy_Menu_1");
			ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
			if (ds.Tables[0].Rows.Count > 0)
			{
			string HPartentID = ds.Tables[0].Rows[0]["HPartentID"].ToString();
			@@ -12996,7 +15875,7 @@
			string HType = ds.Tables[0].Rows[0]["HType"].ToString();
			string HPicNum = ds.Tables[0].Rows[0]["HPicNum"].ToString();

			if(HPartentID == "0" \|\| HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
			if (HPartentID == "0" \|\| HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
			{
			string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "')";
			@@ -13007,12 +15886,12 @@
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','z')";
			oCN.RunProc(sql);
			}


			}
			}
			//提交数据库操作
			oCN.Commit();


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			@@ -13445,15 +16324,15 @@
			/// <returns></returns>
			[Route("Web/GetOtherInBillMain_TempList_New")]
			[HttpGet]
			public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
			public object GetOtherInBillMain_TempList_New(string HBillType, string sHMaker, Int64 HOrgID)
			{
			WebS.WebService1 oWebs = new WebS.WebService1();
			try
			{
			List<object> columnNameList = new List<object>();


			DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");


			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			@@ -13499,12 +16378,12 @@
			/// <returns></returns>
			[Route("Web/GetProcNoList")]
			[HttpGet]
			public object GetProcNoList(int HInterID,string sWhere,string UserID)
			public object GetProcNoList(int HInterID, string sWhere, string UserID)
			{
			List<object> columnNameList = new List<object>();
			try
			{
			ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'" , "h_p_Sc_ProcNoList");
			ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'", "h_p_Sc_ProcNoList");

			objJsonResult.code = "1";
			objJsonResult.count = 1;