MES-WEB-API.git

			@@ -18,9 +18,6 @@
			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
			@@ -36,6 +33,9 @@
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			//public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
			// private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();

			string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];

			/// <summary>
			/// 送货单表头信息
			/// </summary>
			@@ -384,6 +384,51 @@
			return objjson; ;
			}
			}
			/// <summary>
			/// 登录根据ic卡获取信息
			/// </summary>
			/// <param name="HBarCode"></param>
			/// <returns></returns>
			[Route("Web/GetUserByICCard")]
			[HttpGet]
			public object GetUserByICCard(string HBarCode)
			{
			try
			{
			DataSet ds = null;
			ClsCN oCnLoc = new ClsCN();
			DAL.ClsUser oUser = new DAL.ClsUser();
			string sql = string.Format(@" select a.* from h_v_Gy_Czygl_Login a
			where a.HICNumber = '{0}'", HBarCode);
			ds = oCnLoc.RunProcReturn(sql, "h_v_Gy_Czygl_Login");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "无此ic卡对应员工信息！";
			objjson.data = null;
			return objjson;
			}

			objjson.code = "1";
			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>
			/// 菜单栏
			/// </summary>
			@@ -1493,6 +1538,106 @@
			return objjson;
			}
			}


			/// <summary>
			/// 获取班次列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetGy_ShiftsList_Json")]
			[HttpGet]
			public object GetGy_ShiftsList_Json(string Shifts)
			{
			sWhere = " 禁用标记!='Y'";
			if (Shifts != "")
			{
			sWhere = " Where 禁用标记!='Y' and ( 班次代码 like '%" + Shifts + "%' or 班次名称 like '%" + Shifts + "%' ) ";
			}
			else
			{
			sWhere = " Where 禁用标记!='Y' ";
			}
			try
			{
			string sql = $"Select * from h_v_Gy_ShiftsList {sWhere} Order by 班次代码";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_ShiftsList");
			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 = "0";
			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/GetGy_ErrMsgBackTypeList_Json")]
			[HttpGet]
			public object GetGy_ErrMsgBackTypeList_Json(string ErrMsg)
			{
			sWhere = " 禁用标志 ='否'";
			if (ErrMsg != "")
			{
			sWhere = " Where 禁用标志 ='否' and ( 异常反馈类型代码 like '%" + ErrMsg + "%' or 异常反馈类型名称 like '%" + ErrMsg + "%' ) ";
			}
			else
			{
			sWhere = " Where 禁用标志 ='否' ";
			}
			try
			{
			string sql = $"Select * from h_v_Gy_ErrMsgBackType {sWhere} Order by 异常反馈类型代码";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_ErrMsgBackType");
			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 = "0";
			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>
			/// 获取班组列表
			@@ -2630,6 +2775,342 @@
			}
			}

			#region 不良原因文件导入保存
			#region 不良原因文件上传
			[Route("Gy_BadReason/Gy_BadReason_Excel")]
			[HttpPost]
			public object Gy_BadReason_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("HDeptID", typeof(Int32));//部门ID
			tb2.Columns.Add("HProcID", 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 (!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 HName = "";
			string HNum = "";
			string HORGNumber = "";
			string HORGName = "";
			string HDeptNumber = "";
			string HDeptName = "";
			string HProcNumber = "";
			string HProcName = "";

			HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["不良原因"].ToString());
			HNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["不良原因代码"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());
			HDeptNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认部门代码"].ToString());
			HDeptName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认部门"].ToString());
			HProcNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认工序代码"].ToString());
			HProcName = 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();
			}
			if (HDeptNumber != "")
			{
			//查询部门
			ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + HDeptNumber + "' and Hname='" + HDeptName + "'", "Gy_Department");

			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]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			}
			else
			{
			tb2.Rows[i]["HDeptID"] = 0;
			}
			if (HProcNumber != "")
			{
			//查询部门
			ds = oCN.RunProcReturn("select * from Gy_Process where HNumber='" + HProcNumber + "' and Hname='" + HProcName + "'", "Gy_Process");

			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]["HProcID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			}
			else
			{
			tb2.Rows[i]["HProcID"] = 0;
			}

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

			//不良原因代码
			if (HNum == "")
			{
			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_BadReason/Gy_BadReason_btnSave")]
			[HttpPost]
			public object Gy_BadReason_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_BadReason_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 HDeptID = item["HDeptID"].ToString();//部门ID
			string HProcID = item["HProcID"].ToString();//工序ID
			string HName = item["不良原因"].ToString();
			string HNumber = item["不良原因代码"].ToString();
			string HRemark = item["备注"].ToString();
			string HHelpCode = item["助记码"].ToString();
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			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(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_BadReason where HNumber='" + HNumber + "'", "Gy_BadReason");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_BadReason " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HDeptID,HProcID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HBadTypeID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HDeptID.ToString() + "," + HProcID.ToString() +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "'," + 0 + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			oCN.RunProc("Update Gy_BadReason"+ " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + sShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HLevel=" + HLevel.ToString() +
			",HDeptID=" + HDeptID.ToString() +
			",HProcID=" + HProcID.ToString() +
			",HRemark= '" + HRemark + "' Where HNumber='" + HNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			}

			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>
			/// 保存不良类型
			@@ -2833,6 +3314,312 @@
			return objJsonResult;
			}
			}

			#region 不良类型文件导入保存
			#region 不良类型文件上传
			[Route("Gy_BadType/Gy_BadType_Excel")]
			[HttpPost]
			public object Gy_BadType_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("HGroupID", 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 HName = "";
			string HNum = "";
			string HORGNumber = "";
			string HORGName = "";
			string HGroupNumber = "";
			string HGroupName = "";

			HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["不良类型"].ToString());
			HNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["不良类型代码"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());
			HGroupNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认班组代码"].ToString());
			HGroupName = 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();
			}
			if(HGroupNumber != "")
			{
			//查询班组
			ds = oCN.RunProcReturn("select * from Gy_Group where HNumber='" + HGroupNumber + "' and Hname='" + HGroupName + "'", "Gy_Group");

			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]["HGroupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			}
			else
			{
			tb2.Rows[i]["HGroupID"] = 0;
			}


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

			//不良类型代码
			if (HNum == "")
			{
			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_BadType/Gy_BadType_btnSave")]
			[HttpPost]
			public object Gy_BadType_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_BadType_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 HGroupID = item["HGroupID"].ToString();//班组ID
			string HName = item["不良类型"].ToString();
			string HNumber = item["不良类型代码"].ToString();
			string HRemark = item["备注"].ToString();
			string HHelpCode = item["助记码"].ToString();
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			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(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_BadType where HNumber='" + HNumber + "'", "Gy_BadType");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into Gy_BadType" + " " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HGroupID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HUseFlag,HMakeEmp,HMakeTime) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HGroupID.ToString() +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "'," + HOrgID + "," + HOrgID + ",'" + "未检测" + "','" + user + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);

			}
			else
			{
			oCN.RunProc("Update " + "Gy_BadType " + " set " +
			"HName='" + HName + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HRemark= '" + HRemark + "'" +
			",HGroupID= '" + HGroupID + "'" +
			",HModifyEmp= '" + user + "'" +
			",HModifyTime=getdate()" +
			",HUSEORGID=" + HOrgID +
			" 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


			/// <summary>
			@@ -3933,6 +4720,277 @@
			return objJsonResult;
			}
			}

			#region 不良后果文件导入保存
			#region 不良后果文件上传
			[Route("Gy_BadResult/Gy_BadResult_Excel")]
			[HttpPost]
			public object Gy_BadResult_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 HName = "";
			string HNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["不良后果"].ToString());
			HNum = 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();
			}

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

			//不良后果代码
			if (HNum == "")
			{
			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_BadResult/Gy_BadResult_btnSave")]
			[HttpPost]
			public object Gy_BadResult_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_BadResult_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 sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			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(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_BadResult where HNumber='" + HNumber + "'", "Gy_BadResult");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into Gy_BadResult" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HISsystemSet,HCREATEORGID,HERPItemID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + 0 + "','" + HOrgID + "','" + 0 + "')", ref DBUtility.ClsPub.sExeReturnInfo);

			}
			else
			{
			oCN.RunProc("Update " + "Gy_BadResult " + " set " +
			"HName='" + HName + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HRemark= '" + HRemark + "'" +
			",HModifyEmp= '" + user + "'" +
			",HModifyTime=getdate()" +
			",HUSEORGID=" + HOrgID +
			" 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

			#endregion


			@@ -5288,6 +6346,188 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 文件上传
			/// </summary>
			/// <returns></returns>
			[Route("Gy_InspectInstruMent_UploadFile")]
			[HttpPost]
			public object Gy_InspectInstruMent_UploadFile()
			{

			string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //单据号
			string HRemark = HttpContext.Current.Request.Params["HRemark"]; //备注
			string HUserName = HttpContext.Current.Request.Params["HUserName"]; //创建人
			HttpPostedFile files = HttpContext.Current.Request.Files["file"];
			string path = HttpContext.Current.Server.MapPath("~/../Files/Gy_InspectInstruMent/" + HBillNo);
			//string path = @"D:\\Files\\"+ HBillNo;
			dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
			if (dyResult != null && dyResult.result == 1)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "上传成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = dyResult.returnval;
			objJsonResult.data = null;
			return objJsonResult;
			}

			}

			public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
			{
			dynamic Result_Ob = new { result = 1, returnval = "上传成功！" };
			string filePath = Path.GetFullPath(files.FileName);//文件上传路径
			string fileExtension = Path.GetExtension(files.FileName);// 文件扩展名
			string filename = files.FileName;//文件名
			string fileSavePath = path;// 上传保存路径
			int filesize = files.ContentLength;//获取上传文件的大小单位为字节byte
			int Maxsize = 40000 * 1024;//定义上传文件的最大空间大小为40M
			try
			{
			if (files == null \|\| files.ContentLength <= 0)
			{
			Result_Ob = new { result = 0, returnval = "文件不能为空!" };
			return Result_Ob;
			}
			if (filesize >= Maxsize)
			{
			Result_Ob = new { result = 0, returnval = "上传文件超过40M，不能上传！" };
			return Result_Ob;
			}

			string fileurl = Path.Combine(fileSavePath, filename);
			if (Directory.Exists(fileurl) == true) //如果存在重名文件就提示
			{
			Result_Ob = new { result = 0, returnval = "存在同名文件！" };
			return Result_Ob;
			}
			//删除数据表数据
			ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
			if (Directory.Exists(path))
			{
			File.Delete(fileurl); //删除指定文件
			files.SaveAs(fileurl);
			string StrPath = "/files/Gy_InspectInstruMent/" + HBillNo + "/" + filename;
			if (File.Exists(fileurl))
			{
			//这里可以执行一些其它的操作，比如更新数据库
			//写入数据表
			oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
			",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
			",HFileClsID,HSourceBillNo" +
			") values('"
			+ filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
			",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
			"','" + 0 + "','" + HBillNo +
			"') ");
			}
			else
			{
			Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
			}
			}
			else
			{
			Directory.CreateDirectory(fileSavePath); //添加文件夹
			files.SaveAs(fileurl);
			string StrPath = "/files/Gy_InspectInstruMent/" + HBillNo + "/" + filename;
			if (File.Exists(fileurl))
			{
			//这里可以执行一些其它的操作，比如更新数据库
			//写入数据表
			oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
			",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
			",HFileClsID,HSourceBillNo" +
			") values('"
			+ filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
			",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
			"','" + 0 + "','" + HBillNo +
			"') ");
			}
			else
			{
			Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
			}
			}

			}
			catch (Exception e)
			{
			Result_Ob = new { result = 0, returnval = e.Message };
			}
			return Result_Ob;
			}

			/// <summary>
			/// 根据单据号查找上传文件列表
			/// </summary>
			/// <param name="sWhere"></param>
			/// <returns></returns>
			[Route("Gy_InspectInstruMent_Filelist")]
			[HttpGet]
			public object Gy_InspectInstruMent_Filelist(string HBillNo)
			{
			var url = fileip + "/files/Gy_InspectInstruMent/" + HBillNo + "/";
			//@"C:\\files\\"
			try
			{
			ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;

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

			/// <summary>
			/// 根据ID,单据号,文件名删除文件
			/// </summary>
			/// <param name="sWhere"></param>
			/// <returns></returns>
			[Route("Gy_InspectInstruMent_DeleteFilelist")]
			[HttpGet]
			public object Gy_InspectInstruMent_DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
			{
			try
			{

			oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
			string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/EquipTechParamFolder/" + HSourceBillNo), HFileName);
			File.Delete(fileurl); //删除指定文件
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -8679,6 +9919,278 @@
			return objJsonResult;
			}
			}

			#region 供应商分类文件导入保存
			#region 供应商分类文件上传
			[Route("Gy_SupType/Gy_SupType_Excel")]
			[HttpPost]
			public object Gy_SupType_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 HName = "";
			string HNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商分类"].ToString());
			HNum = 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();
			}

			//供应商分类名称
			if (HName == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,供应商分类名称不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//供应商分类代码
			if (HNum == "")
			{
			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_SupType/Gy_SupType_btnSave")]
			[HttpPost]
			public object Gy_SupType_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_SupType_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 sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			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(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_SupType where HNumber='" + HNumber + "'", "Gy_SupType");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_SupType " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + HOrgID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			oCN.RunProc("Update " + "Gy_SupType " + " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + sShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HRemark= '" + HRemark + "'" +
			",HModifyEmp= '" + user + "'" +
			",HModifyTime=getdate()" +
			",HUSEORGID=" + HOrgID +
			" 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


			#endregion

			#region 工艺参数分类设置列表/保存/编辑/删除方法
			@@ -9241,6 +10753,278 @@
			return objJsonResult;
			}
			}


			#region 客户分类文件导入保存
			#region 客户分类文件上传
			[Route("Gy_CusType/Gy_CusType_Excel")]
			[HttpPost]
			public object Gy_CusType_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 HName = "";
			string HNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["客户分类"].ToString());
			HNum = 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();
			}

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

			//客户分类代码
			if (HNum == "")
			{
			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_CusType/Gy_CusType_btnSave")]
			[HttpPost]
			public object Gy_CusType_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_CusType_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 sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			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(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_CusType where HNumber='" + HNumber + "'", "Gy_CusType");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + " Gy_CusType" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + HOrgID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			oCN.RunProc("Update " + "Gy_CusType " + " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + sShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HRemark= '" + HRemark + "'" +
			",HModifyEmp= '" + user + "'" +
			",HModifyTime=getdate()" +
			",HUSEORGID=" + HOrgID +
			" 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

			#endregion

			#region 盘点方案设置列表/保存/编辑/删除方法
			@@ -10680,6 +12464,279 @@
			return objJsonResult;
			}
			}

			#region 不良现象文件导入保存
			#region 不良现象文件上传
			[Route("Gy_BadPhenomena/Gy_BadPhenomena_Excel")]
			[HttpPost]
			public object Gy_BadPhenomena_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 HName = "";
			string HNum = "";
			string HORGNumber = "";
			string HORGName = "";


			HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["不良现象"].ToString());
			HNum = 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();
			}

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

			//不良现象代码
			if (HNum == "")
			{
			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_BadPhenomena/Gy_BadPhenomena_btnSave")]
			[HttpPost]
			public object Gy_BadPhenomena_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_BadPhenomena_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 sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//短代码
			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(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_BadPhenomena where HNumber='" + HNumber + "'", "Gy_BadPhenomena");

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_BadPhenomena " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + HOrgID + "')", ref DBUtility.ClsPub.sExeReturnInfo);

			}
			else
			{
			oCN.RunProc("Update " + "Gy_BadPhenomena " + " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + sShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HRemark= '" + HRemark + "'" +
			",HModifyEmp= '" + user + "'" +
			",HModifyTime=getdate()" +
			",HUSEORGID=" + HOrgID +
			" 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


			#endregion

			#region 项目类别设置列表/保存/编辑/删除方法
			@@ -12999,6 +15056,284 @@
			}
			#endregion


			#region 环境检测单设置列表/保存/编辑/删除方法
			/// <summary>
			/// 保存环境检测单
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveGy_EnvironmentTestItem")]
			[HttpPost]
			public object SaveGy_EnvironmentTestItem([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_EnvironmentTestItem_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 MAX(HItemID) HItemID from Gy_EnvironmentTestItem ", "Gy_EnvironmentTestItem");
			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_EnvironmentTestItem_Ctl oBill = new WebAPI.DLL.ClsGy_EnvironmentTestItem_Ctl();
			List<Model.ClsGy_EnvironmentTestItem_Model> lsmain = new List<Model.ClsGy_EnvironmentTestItem_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_EnvironmentTestItem(msg1);
			foreach (Model.ClsGy_EnvironmentTestItem_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_EnvironmentTestItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_EnvironmentTestItem");
			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.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 = "保存失败！" + 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("GetGy_EnvironmentTestItem_Edit")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_EnvironmentTestItem_Edit(string HID)
			{
			var model = LuBaoSevice.GetGy_EnvironmentTestItemEdit(HID);
			return model;
			}

			/// <summary>
			/// 环境检测单删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_EnvironmentTestItem")]
			[HttpGet]
			public object DeltetGy_EnvironmentTestItem(string HItemID, string user)
			{
			DataSet ds;
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestItem_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();//开始事务
			ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HItemID=" + HItemID, "Gy_EnvironmentTestItem");
			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_EnvironmentTestItem 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;
			}
			}
			#endregion


			/// <summary>
			/// 用关联工序获取信息
			/// </summary>
			@@ -14516,6 +16851,46 @@
			}

			/// <summary>
			/// 根据物料+工序获取检验方案
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetCheckItemID")]
			[HttpGet]
			public object GetCheckItemID(string HName,string HProName)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 物料名称='"+HName+ "' and 工序名称='" + HProName + "' order by 日期 desc ", "h_v_Gy_QCCheckProjectList_Main");
			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>
			@@ -14983,7 +17358,7 @@
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.count = 0;
			objjson.Message = "该设备有多个计划单或点检规程,手动选着" ;
			objjson.data = null;
			return objjson;
			@@ -15636,8 +18011,15 @@
			ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //查询当前用户的自定义菜单数据
			if (ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
			{
			sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu");
			string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName=" +
			"(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " +
			"left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='"+HMakeName+"' order by len(c.GroupName ))";
			ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //查询用户绑定的角色是否设置菜单信息取角色名称最短的一个
			if ((ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0))
			{
			sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu");
			}
			}

			for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //将菜单的根节点保存到列表menu中
			@@ -16081,6 +18463,12 @@
			string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' Order by a.HItemID";
			ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //获取Xt_UserFastMenu中该用户设置的自定义菜单信息，用于在前端加载

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' Order by a.HItemID";
			ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //获取Xt_UserFastMenu中该用户设置的自定义菜单信息，用于在前端加载
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "查询成功！";
			@@ -16551,6 +18939,67 @@
			}
			}


			/// <summary>
			/// 金帅WMS接口
			/// </summary>
			/// <returns></returns>
			[Route("Web/WMSBarcodeQuery")]
			[HttpGet]
			public object WMSBarcodeQuery(DateTime dateTime, string UserName, string PassWord)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//权限判定
			DAL.ClsUser oUser = new DAL.ClsUser();
			DataSet DS;
			DS = oCN.RunProcReturn("select * from Gy_Czygl where Czymc='" + UserName.Trim() + "' and Czmm='" + DBUtility.ClsPub.StrToPsd(PassWord.Trim()) + "' ", "Gy_Czygl");
			if (UserName == "" \|\| UserName != "售后条码查询")
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "用户不对！";
			objjson.data = null;
			return objjson;
			}
			if (DS == null \|\| DS.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "密码错误！";
			objjson.data = null;
			return objjson;
			}
			ds = oCN.RunProcReturn("exec h_p_WMSBarcodeQuery '" + dateTime + "'", "h_p_WMSBarcodeQuery");

			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;
			}
			}

			}

			}