MES-WEB-API.git

			@@ -7,10 +7,15 @@
			using System.Collections.Generic;
			using System.Data;
			using System.Data.SqlClient;
			using System.IO;
			using System.Web;
			using System.Web.Http;
			using System.Windows.Forms;
			using WebAPI.Models;
			using WebAPI.Service;
			using System.Text.RegularExpressions;
			using WebAPI.Controllers.SCGL.日计划管理;
			using SyntacticSugar.constant;

			namespace WebAPI.Controllers
			{
			@@ -19,11 +24,11 @@
			//获取系统参数
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;

			public string sWhere = "";
			private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			DataSet ds;

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


			////检测当前选中行的项目状态
			@@ -76,7 +81,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'");
			string sql1 = string.Format(@"select top(500) * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 物料代码 desc", "h_v_Gy_MaterialList");
			@@ -111,6 +116,314 @@
			return objJsonResult;
			}
			}

			#region 物料分页列表
			[Route("Gy_Material/page")]
			[HttpGet]
			public object page(string sWhere, string user, string Organization,int page,int size)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 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_Gy_MaterialList " + page + "," + size + ",'" + Organization +"'," + "''", "h_p_Gy_MaterialList");
			}
			else
			{
			sWhere = sWhere.Replace("'", "''");
			ds = oCN.RunProcReturn("exec h_p_Gy_MaterialList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Gy_MaterialList");
			}

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

			objJsonResult.code = "1";
			objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			objJsonResult.Message = "Sucess！";
			objJsonResult.list = columnNameList;
			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;
			}
			}
			#endregion

			#region 物料根据分类获取最大物料编码
			[Route("Gy_Material/getMaxNum")]
			[HttpGet]
			public object getMaxNum(int HMaterTypeID, string user, string Organization)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HMaterTypeID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有选择具体分类！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			ds = oCN.RunProcReturn(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'" + "and HMaterTypeID = '"+ HMaterTypeID + "'" + " order by 物料代码 desc", "h_v_Gy_MaterialList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "没有找到该分类的物料编码请使用普通新增";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string HNumber = ds.Tables[0].Rows[0]["物料代码"].ToString();
			// 使用正则表达式找到数字部分 (?<=\D)是一个零宽断言，表示前面的字符不是数字 (\d+)$表示后面跟着一连串字符串知道末尾
			Match match = Regex.Match(HNumber, @"(?<=\D)(\d+)$");
			if (match.Success)
			{
			string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // 提取前缀
			int number = int.Parse(match.Value); // 解析数字
			// 数字+1
			number++;
			// 格式化数字，保持原长度
			string formattedNumber = number.ToString().PadLeft(match.Length, '0');
			// 重新组合字符串
			string result = prefix + formattedNumber;

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "success";
			objJsonResult.data = result;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			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;
			}
			}
			#endregion

			#region 获取物料精度通过id
			[Route("Gy_Material/getDecByID")]
			[HttpGet]
			public object getDecByID(int HMaterID)
			{
			try
			{
			if(HMaterID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有选择物料";
			objJsonResult.data = null;
			return objJsonResult;
			}
			ds = oCN.RunProcReturn(@"select HQtyDec,HPriceDec,HMoneyDec from Gy_Material where HitemID=" + HMaterID , "Gy_Material");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "没有找到该物料编码";
			objJsonResult.data = null;
			return objJsonResult;
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Success";
			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;
			}
			}
			#endregion

			#region 获取项目号
			[Route("Gy_Material/Get_HProject")]
			[HttpGet]
			public object Get_HProject()
			{
			try
			{
			DataSet oDs = new DataSet();
			//==========
			oDs = oCN.RunProcReturn("select top(20) HInterID as HItemID,HProName HName from PM_ProjectBillMain", "PM_ProjectBillMain");
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取成功！";
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult; ;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 获取车间号
			[Route("Gy_Material/Get_HDepartment")]
			[HttpGet]
			public object Get_HDepartment()
			{
			try
			{
			DataSet oDs = new DataSet();
			//==========
			oDs = oCN.RunProcReturn("select top(20) HItemID , HName from Gy_Department", "Gy_Department");
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取成功！";
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult; ;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			/// <summary>
			/// 获取项目列表
			/// </summary>
			/// <returns></returns>
			[Route("Gy_Material/GetProjectGroupList_Json")]
			[HttpGet]
			public object GetProjectGroupList_Json(string Unit)
			{
			if (Unit != "" && Unit != null)
			{
			sWhere = sWhere + " and ( HBillNo like '%" + Unit + "%' or HProName like '%" + Unit + "%' ) ";
			}

			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HInterID,HBillNo 项目代码,HProName 项目组 from PM_ProjectBillMain where HCloseType = 0 Order by HInterID ", "PM_ProjectBillMain");
			}
			else
			{
			string sql1 = "Select HInterID,HBillNo 项目代码,HProName 项目组 from PM_ProjectBillMain where HCloseType = 0 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "PM_ProjectBillMain");
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取成功!";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "获取失败" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#region 获取事业部
			[Route("Gy_Material/Get_Gy_Division")]
			[HttpGet]
			public object Get_Gy_Division(string HOrgID)
			{
			try
			{
			DataSet oDs = new DataSet();
			//==========
			oDs = oCN.RunProcReturn(" select HItemID,HName from Gy_Division", "Gy_Division");
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取成功！";
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult; ;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion


			/// <summary>
			/// 物料设置获取信息
			@@ -284,6 +597,7 @@
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oItem.HMakeEmp = msg2;
			oBill.oModel = oItem;
			}
			//保存
			@@ -296,6 +610,18 @@
			}
			else
			{
			//已审核不允许修改
			DataSet dss;
			dss = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + oBill.oModel.HItemID, "Gy_Material");
			//判断是否可编辑
			if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据状态已经审核，不允许修改！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			}
			if (bResult)
			@@ -326,6 +652,320 @@
			}
			}

			#region 保存物料_批量
			/// <summary>
			/// 保存物料
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Gy_Material/SaveGy_MaterialList_Batch")]
			[HttpPost]
			public object SaveGy_MaterialList_Batch([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();
			string msg_HUSEORGID = sArray[2].ToString();
			bool bResult = false;
			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Material ", "Gy_Material");
			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
			{
			DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
			List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
			foreach (ClsGy_Material_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 (oItem.HMaterTypeID == 0)
			{
			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_Material where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Material");
			//新增时判断
			#region 父级校验方法（api调用先注释掉，）
			/*
			if (oItem.HItemID == 0)
			{
			if (ds == null \|\| ds.Tables[0].Rows.Count > 0)
			{
			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;
			}
			}
			}
			*/
			#endregion
			//得到短代码
			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.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //组织id
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oItem.HModifyEmp = msg2;
			oBill.oModel = oItem;

			if (oBill.oModel.HItemID == 0)
			{
			//bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			}
			else
			{
			bResult = oBill.ModifyByIDDynamic(oBill.oModel.HItemID);
			}
			}
			//保存
			//保存完毕后处理

			/*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 = "1";
			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;
			}
			}
			#endregion

			#region 保存物料_批量
			/// <summary>
			/// 保存物料
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Gy_Material/SaveGy_MaterialList_Modify")]
			[HttpPost]
			public object SaveGy_MaterialList_Modify([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();
			string msg_HUSEORGID = sArray[2].ToString();
			string msg_itemIdList = sArray[3].ToString();
			string msg_UpdateInfo = sArray[4].ToString();
			bool bResult = false;
			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Material ", "Gy_Material");
			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
			{
			DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
			List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
			JObject jobject = JObject.Parse(msg_UpdateInfo);
			var paramStr = "";
			foreach (var property in jobject.Properties())
			{
			string key = property.Name;
			string value = property.Value.ToString();

			// 拼接格式: key=value
			paramStr += string.Format("{0}='{1}',", key, value);
			// 删除最后一个逗号

			}
			paramStr = paramStr.Substring(0, paramStr.Length - 1);

			bResult = oBill.ModifyByIDListDynamic(msg_itemIdList, paramStr, lsmain);


			if (bResult)
			{
			objJsonResult.code = "1";
			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;
			}
			}
			#endregion

			[Route("Gy_Material/SaveGy_MaterialListApi")]
			[HttpPost]
			public object SaveGy_MaterialListApi([FromBody] JObject msg)
			@@ -342,8 +982,10 @@
			List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
			lsmain = oListModels.getObjectByJson_Gy_Material(msg1);

			oBill.oModel = lsmain[0];
			LogService.Write("物料同步插件,保存方法执行完成异常："+ msg1);
			//保存
			bool bResult = oBill.AddNewApi();
			if (bResult)
			@@ -374,6 +1016,458 @@
			}
			}

			#region 物料文件导入保存
			#region 物料文件上传
			[Route("Gy_Material/Gy_Material_Excel")]
			[HttpPost]
			public object Gy_Material_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("HMaterClsID", typeof(Int32));//物料属性ID
			tb2.Columns.Add("HUnitGroupID", typeof(Int32));//计量单位组ID
			tb2.Columns.Add("HUnitID", typeof(Int32));//单位ID
			tb2.Columns.Add("HSecUnitID", typeof(Int32));//辅助计量单位ID
			tb2.Columns.Add("HWhID", 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 (!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 (!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 HMaterName = "";
			string HMaterNumber = "";
			string HORGNumber = "";
			string HORGName = "";
			string HMaterClsName = "";
			string HUnitGroupName = "";
			string HUnitNumber = "";
			string HUnitName = "";
			string HSecUnitName = "";
			string HWhName = "";

			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());
			HMaterNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料代码"].ToString());
			HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料名称"].ToString());
			HMaterClsName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料属性"].ToString());
			HUnitGroupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["计量单位组"].ToString());
			HUnitNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["计量单位代码"].ToString());
			HUnitName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["计量单位"].ToString());
			HSecUnitName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["辅助计量单位"].ToString());
			HWhName = 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 (HMaterClsName == "外购")
			{
			tb2.Rows[i]["HMaterClsID"] = 1;
			}
			else if(HMaterClsName == "自制")
			{
			tb2.Rows[i]["HMaterClsID"] = 2;
			}
			else if (HMaterClsName == "委外")
			{
			tb2.Rows[i]["HMaterClsID"] = 3;
			}
			else
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,物料属性不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//查询计量单位组
			ds = oCN.RunProcReturn("select * from Gy_UnitGroup where HName='" + HUnitGroupName + "'", "Gy_UnitGroup");

			if (ds.Tables[0].Rows.Count == 0 && HUnitGroupName != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + "计量单位组:" + HUnitGroupName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (HMaterNumber == "")
			{
			tb2.Rows[i]["HUnitGroupID"] = 0;
			}
			else
			{
			tb2.Rows[i]["HUnitGroupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询单位
			ds = oCN.RunProcReturn("select * from Gy_Unit where HNumber='" + HUnitNumber + "' and HUSEORGID=" + HORGid + "", "Gy_Unit");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,单位:" + HUnitName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询辅助单位
			ds = oCN.RunProcReturn("select * from Gy_Unit where HName='" + HSecUnitName + "' and HUSEORGID=" + HORGid + "", "Gy_Unit");

			if (ds.Tables[0].Rows.Count == 0 && HSecUnitName != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,单位:" + HSecUnitName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}else if (HSecUnitName == "")
			{
			tb2.Rows[i]["HSecUnitID"] = 0;
			}
			else
			{
			tb2.Rows[i]["HSecUnitID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询仓库
			ds = oCN.RunProcReturn("select * from Gy_Warehouse where HName='" + HWhName + "' and HUSEORGID=" + HORGid + "", "Gy_Warehouse");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,仓库:" + HWhName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//物料名称
			if (HMaterName == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "第" + index + "行,物料名称不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//物料代码
			if (HMaterNumber == "")
			{
			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_Material/Gy_Material_btnSave")]
			[HttpPost]
			public object Gy_Material_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_Material_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)
			{
			DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
			ClsGy_Material_Model oItem = new ClsGy_Material_Model();
			//赋值前端传入的
			oItem.HUSEORGID = int.Parse(item["HOrgID"].ToString());
			oItem.HNumber = item["物料代码"].ToString();
			oItem.HName = item["物料名称"].ToString();
			oItem.HModel = item["规格型号"].ToString();
			oItem.HHelpCode = item["助记码"].ToString();
			oItem.HVersion = item["版本号"].ToString();
			oItem.HMaterClsID = int.Parse(item["HMaterClsID"].ToString());
			oItem.HUnitGroupID = int.Parse(item["HUnitGroupID"].ToString());
			oItem.HUnitID = int.Parse(item["HUnitID"].ToString());
			oItem.HSecUnitID = int.Parse(item["HSecUnitID"].ToString());
			oItem.HSecUnitRate = double.Parse(item["换算率"].ToString()==""?"0": item["换算率"].ToString());
			oItem.HWhID = int.Parse(item["HWhID"].ToString());
			oItem.HHighStock = int.Parse(item["最高库存"].ToString() == "" ? "0" : item["最高库存"].ToString());
			oItem.HLowStock = int.Parse(item["最低库存"].ToString() == "" ? "0" : item["最低库存"].ToString());
			oItem.HSafeStock = int.Parse(item["安全库存"].ToString() == "" ? "0" : item["安全库存"].ToString());
			oItem.HOrderPrice = int.Parse(item["采购单价"].ToString() == "" ? "0" : item["采购单价"].ToString());
			oItem.HSalePrice = int.Parse(item["销售单价"].ToString() == "" ? "0" : item["销售单价"].ToString());
			oItem.HPlanPrice = int.Parse(item["计划单价"].ToString() == "" ? "0" : item["计划单价"].ToString());
			oItem.HstdPrice = int.Parse(item["标准成本"].ToString() == "" ? "0" : item["标准成本"].ToString());
			oItem.HKeepDays = int.Parse(item["保质期"].ToString() == "" ? "0" : item["保质期"].ToString());
			oItem.HQtyMin = int.Parse(item["最小订货量"].ToString() == "" ? "0" : item["最小订货量"].ToString());
			oItem.HQtyMin = int.Parse(item["最大订货量"].ToString() == "" ? "0" : item["最大订货量"].ToString());
			oItem.HEngName = item["英文名称"].ToString();
			oItem.HEngModel = item["英文规格"].ToString();
			//常规赋值赋空值防止报错
			oItem.HMaterTypeID = 0;
			oItem.HColorRemark = "";
			oItem.HColorNo = "";
			oItem.HMaterRuleType = "";
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oBill.oModel = oItem;
			if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

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

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

			oBill.AddNew();
			}
			else
			{

			int HItemID = int.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
			oBill.oModel.HItemID = HItemID;
			oBill.ModifyByID(oBill.oModel.HItemID);

			}

			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>
			/// 物料设置删除功能
			/// </summary>
			@@ -382,11 +1476,11 @@
			[HttpGet]
			public object DeltetGy_Material(string HItemID, string user)
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			oCN.BeginTran();//开始事务
			DataSet ds;
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			if (user == "10000")//api同步方式
			{
			oCN.RunProc("delete from Gy_Material where HERPItemID=" + HItemID);
			@@ -414,7 +1508,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务

			ds = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + HItemID, "Gy_Material");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			@@ -648,7 +1742,49 @@
			}
			#endregion

			#region 获取当前公司名
			/// <summary>
			///
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="IsAudit">审核(0),反审核(1)</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("Xt_getInfo/getCompanyName")]
			[HttpGet]
			public object getCompanyName()
			{
			try
			{
			string sErr = "";
			if(oSystemParameter.ShowBill(ref sErr))
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = oSystemParameter.omodel.WMS_CampanyName;
			objJsonResult.data = oSystemParameter.omodel.WMS_CampanyName;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前公司名获取失败！" ;
			objJsonResult.data = null;
			}

			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion


			/// <summary>
			@@ -697,6 +1833,143 @@
			}
			}

			#region 模具列表分页列表
			[Route("Gy_Mould/page")]
			[HttpGet]
			public object Gy_MouldPage(string sWhere,string ModRightNameSelect,string user, int page, int size)
			{
			DataSet ds;
			json res = new json();
			try
			{
			List<object> columnNameList = new List<object>();
			if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 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_Gy_MouldFileList " + page + "," + size + ",''", "h_p_Gy_MouldFileList");
			}
			else
			{
			sWhere = sWhere.Replace("'", "''");
			ds = oCN.RunProcReturn("exec h_p_Gy_MouldFileList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_MouldFileList");
			}

			//添加列名
			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




			#region 器具档案列表树状图设备分类查询
			public class TreeModel
			{
			public string id { get; set; }
			public string title { get; set; }
			public List<TreeModel> children = new List<TreeModel>();
			}
			[Route("Gy_Mould/TreeList")]
			[HttpGet]
			public object TreeList(string sWhere, string user)
			{
			try
			{

			ds = oCN.RunProcReturn("select HItemID,HNumber,HName from Gy_MouldType", "Gy_MouldType");

			List<TreeModel> treeModels = new List<TreeModel>();
			TreeModel first = new TreeModel();
			first.id = "0";
			first.title = "器具分类设置";
			treeModels.Add(first);

			foreach (DataRow row in ds.Tables[0].Rows)
			{
			var strLen = row["hitemid"].ToString().Split('.');
			if (strLen.Length == 1)
			{
			TreeModel tree = new TreeModel();
			tree.id = row["HItemID"].ToString();
			tree.title = row["HName"].ToString();
			treeModels[0].children.Add(tree);
			}
			}
			digui(ds.Tables[0], treeModels[0].children, 2);


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			/// <summary>
			/// 递归函数
			/// </summary>
			public void digui(DataTable dt, List<TreeModel> tree, int num)
			{
			for (int m = 0; m < tree.Count; m++)
			{
			tree[m].children = new List<TreeModel>();
			for (int i = 0; i < dt.Rows.Count; i++)//第一次循环，得到所有根节点的子集
			{
			var strLen = dt.Rows[i]["HNumber"].ToString().Split('.');
			if (strLen.Length == num && dt.Rows[i]["HNumber"].ToString().Contains(tree[m].id + "."))
			{
			TreeModel tbjson = new TreeModel();
			tbjson.id = dt.Rows[i]["HItemID"].ToString();
			tbjson.title = dt.Rows[i]["HName"].ToString();
			tree[m].children.Add(tbjson);
			}
			}
			var strLens = tree[m].id.Split('.');
			for (int i = 0; i < tree[m].children.Count; i++)
			{
			digui(dt, tree[m].children, strLens.Length + 2);//再次用子集去循环，拿出子集的子集
			}
			}

			}
			#endregion



			@@ -760,6 +2033,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Query", 1, false, user))
			{
			@@ -770,14 +2044,23 @@
			return objJsonResult;
			}

			string sql1 = "select top 1000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
			string sql1 = "select top 15000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_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列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			@@ -820,7 +2103,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.Message = "[0000-1-058]无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -831,7 +2114,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除条码前判断发生错误！";
			objJsonResult.Message = "[3899-1-001]删除条码前判断发生错误！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -841,9 +2124,9 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.Message = "[0000-1-007]" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			return objJsonResult;
			}
			}
			//Int64 lngBillKey = 0;
			@@ -852,11 +2135,22 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据ID为空！";
			objJsonResult.Message = "[0000-1-009]单据ID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			//进行会计期间结账的判断和控制
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID in (" + HInterID + ")", "h_v_IF_BarCodeBillList");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			@@ -886,7 +2180,7 @@
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.Message = "[0000-1-008]删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -894,7 +2188,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未找到";
			objJsonResult.Message = "[0000-1-045]单据未找到";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -904,14 +2198,392 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message;
			objJsonResult.Message = "[0000-1-007]" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 条码主档维护作废/反作废
			/// <summary>
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="IsAudit">作废(0),反作废(1)</param>
			/// <param name="CurUserName">作废人</param>
			/// <returns></returns>
			[Route("Gy_BarCodeBillList/DeleteGy_BarCodeBillList")]
			[HttpGet]
			public object DeleteGy_BarCodeBillList(int HInterID, int IsAudit, string CurUserName)
			{
			string ModRightNameCheck = "Gy_BarCodeBillList_Delete";
			DBUtility.ClsPub.CurUserName = CurUserName;
			try
			{
			//检查权限
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-063]作废失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//HInterID数据判断
			if (HInterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-009]HInterID小于0！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID); //对HInterID进行类型的转换

			//进行需要进行的作废/反作废操作
			if (IsAudit == 0) //作废提交
			{
			string sql_deleteBeforeCtrl = "exec h_p_Gy_BarCodeBill_Cancelltion_Before " + HInterID;
			DataSet ds_deleteBeforeCtrl = oCN.RunProcReturn(sql_deleteBeforeCtrl, "h_p_Gy_BarCodeBill_Cancelltion_Before");
			if (ds_deleteBeforeCtrl == null \|\| ds_deleteBeforeCtrl.Tables.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "作废失败：条码作废前控制失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}else if(ds_deleteBeforeCtrl.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "作废失败：" + ds_deleteBeforeCtrl.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();

			//作废条码
			oCN.RunProc("update Gy_BarCodeBill set HStopflag=1,HDeleteMan='" + CurUserName + "',HDeleteDate=getdate() where HItemID in (" + HInterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);

			string sql = "select * from Gy_BarCodeBill where HItemID = " + HInterID;
			ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill");
			if(ds!=null && ds.Tables[0].Rows.Count > 0)
			{
			string HBarCode = ds.Tables[0].Rows[0]["HBarCode"].ToString();

			//添加操作日志
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','作废条码：" + HBarCode + "','WMS系统-条码档案列表模块','" + DBUtility.ClsPub.IPAddress + "','作废'", ref DBUtility.ClsPub.sExeReturnInfo);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "[0000-1-040]作废成功";
			objJsonResult.data = null;

			oCN.Commit();
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-042]作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;

			oCN.RollBack();
			}


			return objJsonResult;
			}
			if (IsAudit == 1) //反关闭提交
			{
			oCN.BeginTran();

			#region 反作废条码前进行判断
			//反作废条码前进行判断------------------------------------------------------------------------------------------------------------------------------------------------------
			//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
			DataSet DS = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_UnCancelltion '" + HInterID + "','N'", "h_p_Gy_BarCodeBill_UnCancelltion", ref DBUtility.ClsPub.sExeReturnInfo);
			if (DS == null \|\| DS.Tables[0].Rows.Count <= 0)
			{
			oCN.RollBack();

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-042]反作废失败，原因：反作废条码前判断发生错误！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
			{
			oCN.RollBack();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "[0000-1-042]反作废失败，原因：" + DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
			//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
			#endregion

			//反作废条码
			oCN.RunProc("update Gy_BarCodeBill set HStopflag=0,HDeleteMan='',HDeleteDate=null where HItemID in (" + HInterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);

			//增加操作日志
			string sql = "select * from Gy_BarCodeBill where HItemID = " + HInterID;
			ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill");
			if (ds != null && ds.Tables[0].Rows.Count > 0)
			{
			string HBarCode = ds.Tables[0].Rows[0]["HBarCode"].ToString();
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','反作废条码：" + HBarCode + "','WMS系统-条码档案列表模块','" + DBUtility.ClsPub.IPAddress + "','反作废'", ref DBUtility.ClsPub.sExeReturnInfo);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "[0000-1-043]反作废成功";
			objJsonResult.data = null;
			oCN.Commit();
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-042]反作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			}
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-044]作废失败或者反作废失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 条码主档维护批量作废/批量反作废
			/// <summary>
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="IsAudit">作废(0),反作废(1)</param>
			/// <param name="CurUserName">作废人</param>
			/// <returns></returns>
			[Route("Gy_BarCodeBillList/DeleteBatchGy_BarCodeBillList")]
			[HttpGet]
			public object DeleteBatchGy_BarCodeBillList(string HInterID, int IsAudit, string CurUserName)
			{
			string ModRightNameCheck = "Gy_BarCodeBillList_Delete";
			DBUtility.ClsPub.CurUserName = CurUserName;
			try
			{
			//检查权限
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-063]作废/反作废失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//HInterID数据判断
			if (HInterID.Length<=0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未选择需要作废/反作废的条码";
			objJsonResult.data = null;
			return objJsonResult;
			}


			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID); //对HInterID进行类型的转换

			//进行需要进行的作废/反作废操作
			if (IsAudit == 0) //作废提交
			{
			string sql_deleteBeforeCtrl = "exec h_p_Gy_BarCodeBill_Cancelltion_Before '" + HInterID + "'";
			DataSet ds_deleteBeforeCtrl = oCN.RunProcReturn(sql_deleteBeforeCtrl, "h_p_Gy_BarCodeBill_Cancelltion_Before");
			if (ds_deleteBeforeCtrl == null \|\| ds_deleteBeforeCtrl.Tables.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "作废失败：条码作废前控制失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (ds_deleteBeforeCtrl.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "作废失败：" + ds_deleteBeforeCtrl.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();

			//作废条码
			oCN.RunProc("update Gy_BarCodeBill set HStopflag=1,HDeleteMan='" + CurUserName + "',HDeleteDate=getdate() where HItemID in (" + HInterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);

			string sql = "select * from Gy_BarCodeBill where HItemID in (" + HInterID + ")";
			ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill");
			if (ds != null && ds.Tables[0].Rows.Count > 0)
			{
			string HBarCode = "";
			for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
			{
			HBarCode = ds.Tables[0].Rows[0]["HBarCode"].ToString() + "；";
			}


			//添加操作日志
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','作废条码：" + HBarCode + "','WMS系统-条码档案列表模块','" + DBUtility.ClsPub.IPAddress + "','作废'", ref DBUtility.ClsPub.sExeReturnInfo);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "[0000-1-040]作废成功";
			objJsonResult.data = null;

			oCN.Commit();
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-042]作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;

			oCN.RollBack();
			}


			return objJsonResult;
			}
			if (IsAudit == 1) //反关闭提交
			{
			oCN.BeginTran();

			//#region 反作废条码前进行判断
			////反作废条码前进行判断------------------------------------------------------------------------------------------------------------------------------------------------------
			////--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
			//DataSet DS = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_UnCancelltion '" + HInterID + "','N'", "h_p_Gy_BarCodeBill_UnCancelltion", ref DBUtility.ClsPub.sExeReturnInfo);
			//if (DS == null \|\| DS.Tables[0].Rows.Count <= 0)
			//{
			// oCN.RollBack();

			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "[0000-1-042]反作废失败，原因：反作废条码前判断发生错误！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//else
			//{
			// if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
			// {
			// oCN.RollBack();

			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "[0000-1-042]反作废失败，原因：" + DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			//}
			////--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
			////--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
			//#endregion

			//反作废条码
			oCN.RunProc("update Gy_BarCodeBill set HStopflag=0,HDeleteMan='',HDeleteDate=null where HItemID in (" + HInterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);

			//增加操作日志
			string sql = "select * from Gy_BarCodeBill where HItemID in (" + HInterID + ")";
			ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill");
			if (ds != null && ds.Tables[0].Rows.Count > 0)
			{
			string HBarCode = "";
			for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
			{
			HBarCode = ds.Tables[0].Rows[0]["HBarCode"].ToString() + "；";
			}

			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','反作废条码：" + HBarCode + "','WMS系统-条码档案列表模块','" + DBUtility.ClsPub.IPAddress + "','反作废'", ref DBUtility.ClsPub.sExeReturnInfo);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "[0000-1-043]反作废成功";
			objJsonResult.data = null;
			oCN.Commit();
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-042]反作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			}
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-044]作废失败或者反作废失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region[器具档案编辑时获取子表数据]
			[Route("Gy_MouldFileMain/Gy_MouldFileSubDetai")]
			[HttpGet]
			public object Gy_MouldFileSubDetai(long HInterID)
			{
			try
			{
			List<DataTable> tableList = new List<DataTable>();
			ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_MouldFileSub_MaintainRule AS a left join Sc_MouldMaintainRuleBillMain as b on b.HInterID = a.HMaintainRuleID where a.HInterID = " + HInterID, "Gy_MouldFileBill_MaintainRule");
			tableList.Add(ds.Tables[0]);
			ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_MouldFileSub_DotCheckRule AS a left join Sc_MouldDotCheckRuleBillMain as b on b.HInterID = a.HDotCheckRuleID where a.HInterID = " + HInterID, "Gy_MouldFileBill_DotCheckRule");
			tableList.Add(ds.Tables[0]);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.data = tableList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			/// <summary>
			/// 新增模具档案-保存按钮
			///参数：string sql。
			@@ -938,10 +2610,9 @@
			return objJsonResult;
			}
			//保存主表
			objJsonResult = AddBillMain(msg2);
			objJsonResult = AddBillMain(msg1);
			if (objJsonResult.code == "0")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = objJsonResult.Message;
			@@ -955,8 +2626,15 @@
			return objJsonResult;
			}

			public json AddBillMain(string msg2)
			public json AddBillMain(string msg1)
			{
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();//模块权限
			string msg4 = sArray[2].ToString();//当前人
			string msg5 = sArray[3].ToString();//子表数据
			string msg6 = sArray[4].ToString();//子表1数据
			string msg7 = sArray[5].ToString();//子表2数据
			try
			{
			msg2 = "[" + msg2.ToString() + "]";
			@@ -994,6 +2672,7 @@
			long HSPID = mainList[0].HSPID;
			Double HDesignLife = mainList[0].HDesignLife;
			Double HUseLife = mainList[0].HUseLife;
			Double HInitLife = mainList[0].HInitLife;//上线初始化寿命
			Double HLeaveLife = mainList[0].HLeaveLife;
			Double HProdQty = mainList[0].HProdQty;
			Double HProdWeight = mainList[0].HProdWeight;
			@@ -1010,6 +2689,34 @@
			int HNowSupID = mainList[0].HNowSupID;
			int HNowSupTypeID = mainList[0].HNowSupTypeID;
			int HMadeSupID = mainList[0].HMadeSupID;
			string HMouldClass = mainList[0].HMouldClass;
			int HNowWHID = mainList[0].HNowWHID;
			int HNowSPID = mainList[0].HNowSPID;
			string HMouldUseStatus = mainList[0].HMouldUseStatus;
			int HCREATEORGID = mainList[0].HCREATEORGID;
			int HUSEORGID = mainList[0].HUSEORGID;

			//保存前控制=========================================
			string HBillNote = "";
			ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_BeforeSaveCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================


			//主表
			@@ -1023,7 +2730,7 @@
			",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
			",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
			",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
			") " +
			",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID) " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
			",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
			@@ -1033,8 +2740,7 @@
			"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
			"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
			",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
			") ");

			",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "',"+ HCREATEORGID + ","+ HUSEORGID + ") ");

			//子表
			oCN.RunProc("Insert into Gy_MouldFileSub " +
			@@ -1044,6 +2750,31 @@
			" values('" + HInterID + "',0,''" +
			",0,0,'','',0,0 " +
			") ");

			objJsonResult = AddBillSub(msg5,msg6,msg7,HInterID, HBillNo);

			//保存后控制=========================================
			ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_AfterSaveCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//=========================================================


			if (objJsonResult.code == "0")
			{
			@@ -1062,6 +2793,7 @@
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			@@ -1086,6 +2818,9 @@
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();//模块权限
			string msg4 = sArray[2].ToString();//当前人
			string msg5 = sArray[3].ToString();//子表数据
			string msg6 = sArray[4].ToString();//子表2数据
			string msg7 = sArray[5].ToString();//子表3数据
			try
			{
			if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
			@@ -1135,6 +2870,7 @@
			long HSPID = mainList[0].HSPID;
			Double HDesignLife = mainList[0].HDesignLife;
			Double HUseLife = mainList[0].HUseLife;
			Double HInitLife = mainList[0].HInitLife;
			Double HLeaveLife = mainList[0].HLeaveLife;
			Double HProdQty = mainList[0].HProdQty;
			Double HProdWeight = mainList[0].HProdWeight;
			@@ -1151,9 +2887,37 @@
			int HNowSupID = mainList[0].HNowSupID;
			int HNowSupTypeID = mainList[0].HNowSupTypeID;
			int HMadeSupID = mainList[0].HMadeSupID;

			string HMouldClass = mainList[0].HMouldClass;
			int HNowWHID = mainList[0].HNowWHID;
			int HNowSPID = mainList[0].HNowSPID;
			string HMouldUseStatus = mainList[0].HMouldUseStatus;
			int HUSEORGID = mainList[0].HUSEORGID;
			DateTime HNextMainDate = mainList[0].HNextMainDate;
			//若MAINDI重复则重新获取
			oCN.BeginTran();

			//保存前控制=========================================
			string HBillNote = "";
			ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_BeforeSaveCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================

			//主表
			oCN.RunProc("UpDate Gy_MouldFileMain set " +
			" HBillNo='" + HBillNo + "'" + //固定赋值===============
			@@ -1174,7 +2938,9 @@
			",HPICNo='" + HPICNo + "'" +
			",HWorkMaterModel='" + HWorkMaterModel + "'" +
			",HMaterID=" + HMaterID.ToString() +
			",HUSEORGID=" + HUSEORGID.ToString() +
			",HMaterNumber='" + HMaterNumber + "'" +
			",HMouldClass='" + HMouldClass + "'" +
			",HMouldType=" + HMouleTypeID.ToString() +
			",HUnitID=" + HUnitID.ToString() +
			",HOutComDate='" + HOutComDate + "'" +
			@@ -1204,13 +2970,46 @@
			",HProdWeight=" + HProdWeight.ToString() +
			",HBarCode='" + HBarCode.ToString() + "'" +
			",HMadeSupID=" + HMadeSupID +
			" where HInterID=" + HInterID.ToString());
			",HNowWHID=" + HNowWHID +
			",HNowSPID=" + HNowSPID +
			",HInitLife='" + HInitLife +
			"',HNextMainDate='" + HNextMainDate +
			"',HMouldUseStatus='" + HMouldUseStatus +
			"' where HInterID=" + HInterID.ToString());

			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			// oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//

			oCN.RunProc("delete from Gy_MouldFileSub_SubMater where HInterID='" + HInterID + "'");
			oCN.RunProc("delete from Gy_MouldFileSub_MaintainRule where HInterID='" + HInterID + "'");
			oCN.RunProc("delete from Gy_MouldFileSub_DotCheckRule where HInterID='" + HInterID + "'");
			objJsonResult = AddBillSub(msg5, msg6, msg7, HInterID, HBillNo);


			//保存后控制=========================================
			ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_AfterSaveCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//=========================================================

			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1229,6 +3028,86 @@
			}
			}

			public json AddBillSub(string msg5, string msg6, string msg7, long HInterID, string HBillNo)
			{
			List<Gy_MouldFileSub_SubMater> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_MouldFileSub_SubMater>>(msg5);
			List<ClsGy_MouldFileBillSub_MaintainRule> MaintainRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_MouldFileBillSub_MaintainRule>>(msg6);

			List<ClsGy_MouldFileBillSub_DotCheckRule> DotCheckRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_MouldFileBillSub_DotCheckRule>>(msg7);
			int i = 0; //作为子表内码
			foreach (Gy_MouldFileSub_SubMater oSub in DetailColl)
			{
			i++; //同一个主表下的子表的内码自增

			int HEntryID = i;
			string HRemark = oSub.HRemark;
			int HMouldFileID = oSub.HMouldFileID;
			DateTime HUnionDate = oSub.HUnionDate;

			string sql = "insert into Gy_MouldFileSub_SubMater" +
			"(HInterID,HBillNo_bak,HEntryID,HRemark,HMouldFileID,HUnionDate) " +
			"values(" +
			"" + HInterID +
			",'" + HBillNo +
			"'," + HEntryID +
			",'" + HRemark +
			"','" + HMouldFileID +
			"','" + HUnionDate +
			"')";

			oCN.RunProc(sql);
			}
			i = 0;
			//保存保养规格
			foreach (ClsGy_MouldFileBillSub_MaintainRule oSub in MaintainRuleColl)
			{
			i++;
			Int64 NewHEntryID = i;
			Int64 newHFlag = 1;
			if (oSub.HStdFlag == true)
			{
			newHFlag = 1;
			}
			else
			{
			newHFlag = 0;
			}
			oCN.RunProc($@"Insert into Gy_MouldFileSub_MaintainRule
			(HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
			HMaintainRuleID,HStdFlag
			)
			values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
			,{oSub.HMaintainRuleID},{newHFlag})");
			}
			i = 0;
			//保存点检规程
			foreach (ClsGy_MouldFileBillSub_DotCheckRule oSub in DotCheckRuleColl)
			{
			i++;
			Int64 NewHEntryID = i;
			Int64 newHFlag = 1;
			if (oSub.HStdFlag == true)
			{
			newHFlag = 1;
			}
			else
			{
			newHFlag = 0;
			}
			oCN.RunProc($@"Insert into Gy_MouldFileSub_DotCheckRule
			(HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
			HDotCheckRuleID,HStdFlag
			)
			values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
			,{oSub.HDotCheckRuleID},{newHFlag})");
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;
			objJsonResult.data = null;
			return objJsonResult;
			}

			/// <summary>
			/// 磨具档案修改按钮方法-计算下次保养/校正日期-获取档案最近一次的保养记录
			@@ -1276,7 +3155,7 @@
			{
			try
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList where hmainid=" + HInterID, "h_v_Gy_MouldFileList");
			ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFile_Edit where hmainid=" + HInterID, "h_v_Gy_MouldFile_Edit");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1314,8 +3193,69 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID = " + hmainid + " and ISNULL(HChecker,'') <> ''", "Gy_MouldFileMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！单据已审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			oCN.BeginTran();
			//删除前控制=========================================
			ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFile_BeforeDelCtrl " + hmainid + ",'" + User + "'", "h_p_Gy_MouldFile_BeforeDelCtrl");

			if (ds == null)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除前判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================

			oCN.RunProc("Delete From Gy_MouldFileSub_MaintainRule where HInterID=" + hmainid);
			oCN.RunProc("Delete From Gy_MouldFileSub_DotCheckRule where HInterID=" + hmainid);

			//删除后控制=========================================
			DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_MouldFile_AfterDelCtrl " + hmainid + ",'" + User + "'", "h_p_Gy_MouldFile_AfterDelCtrl");
			if (ds2 == null)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除后判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================

			oCN.Commit();
			//写入日志
			ClsPub.Add_Log("", "删除项目，代码：" + oBill.omodel.HMouldNo + ",名称：" + oBill.omodel.HName, ClsPub.CurUserName);
			//更新上级为末级
			@@ -1410,7 +3350,7 @@
			#region [同步基础资料]
			[Route("Gy_Material/Gy_MaterialViewApi")]
			[HttpGet]
			public json Gy_MaterialViewApi(string Number, string Type)
			public json Gy_MaterialViewApi(string Number, string Type, string HUseOrgID)
			{
			string sql = string.Empty;
			string sReturn = "";
			@@ -1468,14 +3408,24 @@
			{
			#region [公有云模式，调用WEBAPI的方式进行更新]
			var json = new
			// {
			// CreateOrgId = 0,
			// Number = Number,
			// Id = ""
			// };
			{
			CreateOrgId = 0,
			Number = Number,
			Id = ""
			FormId= "BD_MATERIAL",
			FieldKeys= "FMASTERID,FNUMBER,FNAME,FSPECIFICATION,FFORBIDSTATUS,FErpClsID,FBaseUnitId,FLENGTH,FWIDTH,FHEIGHT,FNETWEIGHT,FGROSSWEIGHT,FOldNumber,FSTOCKPLACEID,FPLANMODE,FCREATEDATE,FCREATEORGID,FUSEORGID,FISBATCHMANAGE,FCheckIncoming,FIsEnable1,FIsKFPeriod,FAuxUnitID,FSNUNIT,FBaseUnitId,FSaleUnitId,FSalePriceUnitId,FPerUnitStandHour,FStdLaborPrePareTime,FStdMachinePrepareTime",
			FilterString= $@"FNUMBER='{Number}' AND FUSEORGID={HUseOrgID}",
			OrderString= "",
			TopRowCount= 0,
			StartRow= 0,
			Limit= 0
			};
			#region [金蝶部分]
			//登录金蝶
			var loginRet = InvokeHelper.Login();

			#region [金蝶部分]
			//登录金蝶
			var loginRet = InvokeHelper.Login();
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			//判断是否登录成功
			if (isSuccess < 0)
			@@ -1487,14 +3437,22 @@
			return objJsonResult;
			}
			//查看获取数据
			var _result = InvokeHelper.View("BD_MATERIAL", JsonConvert.SerializeObject(json));
			var _saveObj = JObject.Parse(_result);
			var _result = InvokeHelper.Query("BD_MATERIAL", JsonConvert.SerializeObject(json));
			var _saveObj = JArray.Parse(_result);
			//判断数据是否获取成功
			if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			// if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "金蝶物料同步失败jsonRoot：" + _result;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			if (_saveObj.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "金蝶物料同步失败jsonRoot：" + _result;
			objJsonResult.Message = "金蝶客户同步失败，使用组织对应的物料代码无对应的物料";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1510,47 +3468,89 @@

			#region [表数据赋值]
			var jsonData = new
			// {
			// HItemID = _saveObj["Result"]["Result"]["Id"],
			// HERPItemID = _saveObj["Result"]["Result"]["Id"],
			// HNumber = _saveObj["Result"]["Result"]["Number"],
			// HName = _saveObj["Result"]["Result"]["Name"][1]["Value"],
			// HModel = _saveObj["Result"]["Result"]["Specification"][0]["Value"],
			// HShortNumber = _saveObj["Result"]["Result"]["Number"],
			// HParentID = 0,
			// HLevel = 1,
			// HEndFlag = 1,
			// HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1 ,
			// HRemark = "CLD-ERP导入",
			// HMaterClsID = _saveObj["Result"]["Result"]["MaterialBase"][0]["ErpClsID"],
			// HUnitID = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
			// HUnitGroupID = 0,
			// HLength = _saveObj["Result"]["Result"]["MaterialBase"][0]["LENGTH"],
			// HWidth = _saveObj["Result"]["Result"]["MaterialBase"][0]["WIDTH"],
			// HHeight = _saveObj["Result"]["Result"]["MaterialBase"][0]["HEIGHT"],
			// HJQty = _saveObj["Result"]["Result"]["MaterialBase"][0]["NETWEIGHT"],
			// HMQty = _saveObj["Result"]["Result"]["MaterialBase"][0]["GROSSWEIGHT"],
			// HOldMaterNumber = _saveObj["Result"]["Result"]["OldNumber"],
			// HWHID = 0,
			// HSPID = _saveObj["Result"]["Result"]["MaterialStock"][0]["StockPlaceId_Id"],
			// HPlanMode = _saveObj["Result"]["Result"]["MaterialPlan"][0]["PlanMode"],
			// HUseFlag = "未检验",
			// HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
			// HMinPickQty = 0,
			// HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
			// HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
			// HBatchManager = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsBatchManage"].ToString() == "false" ? 0 : 1,
			// HCHECKINCOMING = _saveObj["Result"]["Result"]["MaterialQM"][0]["CheckIncoming"].ToString() == "false" ? 0 : 1,
			// HAuxPropFlag = _saveObj["Result"]["Result"]["MaterialAuxPty"][0]["IsEnable1"].ToString() == "false" ? 0 : 1,
			// HISKFPERIOD = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsKFPeriod"].ToString() == "false" ? 0 : 1,
			// HAuxUnitID = _saveObj["Result"]["Result"]["MaterialStock"][0]["AuxUnitID_Id"],
			// HSNUnitID = _saveObj["Result"]["Result"]["MaterialStock"][0]["SNUnit_Id"],
			// HBASEUNITID = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
			// HSALEUNITID = _saveObj["Result"]["Result"]["MaterialSale"][0]["SaleUnitId_Id"],
			// HSALEPRICEUNITID = _saveObj["Result"]["Result"]["MaterialSale"][0]["SalePriceUnitId_Id"],
			// HPERUNITSTANDHOUR = _saveObj["Result"]["Result"]["MaterialProduce"][0]["PerUnitStandHour"],
			// HSTDLABORPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdLaborPrePareTime"],
			// HSTDMACHINEPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdMachinePrepareTime"]
			// };
			{
			HItemID = _saveObj["Result"]["Result"]["Id"],
			HERPItemID = _saveObj["Result"]["Result"]["Id"],
			HNumber = _saveObj["Result"]["Result"]["Number"],
			HName = _saveObj["Result"]["Result"]["Name"][1]["Value"],
			HModel = _saveObj["Result"]["Result"]["Specification"][0]["Value"],
			HShortNumber = _saveObj["Result"]["Result"]["Number"],
			HParentID = 0,
			HLevel = 1,
			HEndFlag = 1,
			HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1 ,
			HRemark = "CLD-ERP导入",
			HMaterClsID = _saveObj["Result"]["Result"]["MaterialBase"][0]["ErpClsID"],
			HUnitID = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
			HUnitGroupID = 0,
			HLength = _saveObj["Result"]["Result"]["MaterialBase"][0]["LENGTH"],
			HWidth = _saveObj["Result"]["Result"]["MaterialBase"][0]["WIDTH"],
			HHeight = _saveObj["Result"]["Result"]["MaterialBase"][0]["HEIGHT"],
			HJQty = _saveObj["Result"]["Result"]["MaterialBase"][0]["NETWEIGHT"],
			HMQty = _saveObj["Result"]["Result"]["MaterialBase"][0]["GROSSWEIGHT"],
			HOldMaterNumber = _saveObj["Result"]["Result"]["OldNumber"],
			HWHID = 0,
			HSPID = _saveObj["Result"]["Result"]["MaterialStock"][0]["StockPlaceId_Id"],
			HPlanMode = _saveObj["Result"]["Result"]["MaterialPlan"][0]["PlanMode"],
			HUseFlag = "未检验",
			HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
			HMinPickQty = 0,
			HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
			HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
			HBatchManager = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsBatchManage"].ToString() == "false" ? 0 : 1,
			HCHECKINCOMING = _saveObj["Result"]["Result"]["MaterialQM"][0]["CheckIncoming"].ToString() == "false" ? 0 : 1,
			HAuxPropFlag = _saveObj["Result"]["Result"]["MaterialAuxPty"][0]["IsEnable1"].ToString() == "false" ? 0 : 1,
			HISKFPERIOD = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsKFPeriod"].ToString() == "false" ? 0 : 1,
			HAuxUnitID = _saveObj["Result"]["Result"]["MaterialStock"][0]["AuxUnitID_Id"],
			HSNUnitID = _saveObj["Result"]["Result"]["MaterialStock"][0]["SNUnit_Id"],
			HBASEUNITID = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
			HSALEUNITID = _saveObj["Result"]["Result"]["MaterialSale"][0]["SaleUnitId_Id"],
			HSALEPRICEUNITID = _saveObj["Result"]["Result"]["MaterialSale"][0]["SalePriceUnitId_Id"],
			HPERUNITSTANDHOUR = _saveObj["Result"]["Result"]["MaterialProduce"][0]["PerUnitStandHour"],
			HSTDLABORPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdLaborPrePareTime"],
			HSTDMACHINEPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdMachinePrepareTime"]
			HItemID = _saveObj[0][0], // 对应FMASTERID
			HERPItemID = _saveObj[0][0], // 对应FMASTERID
			HNumber = _saveObj[0][1], // 对应FNUMBER
			HName = _saveObj[0][2], // 对应FNAME
			HModel = _saveObj[0][3], // 对应FSPECIFICATION
			HShortNumber = _saveObj[0][1], // 对应FNUMBER
			HParentID = 0,
			HLevel = 1,
			HEndFlag = 1,
			HStopflag = _saveObj[0][4].ToString() == "A" ? 0 : 1, // 对应FFORBIDSTATUS
			HRemark = "CLD-ERP导入",
			HMaterClsID = _saveObj[0][5], // 对应FErpClsID
			HUnitID = _saveObj[0][6], // 对应FBaseUnitId
			HUnitGroupID = 0,
			HLength = _saveObj[0][7], // 对应FLENGTH
			HWidth = _saveObj[0][8], // 对应FWIDTH
			HHeight = _saveObj[0][9], // 对应FHEIGHT
			HJQty = _saveObj[0][10], // 对应FNETWEIGHT
			HMQty = _saveObj[0][11], // 对应FGROSSWEIGHT
			HOldMaterNumber = _saveObj[0][12], // 对应FOldNumber
			HWHID = 0,
			HSPID = _saveObj[0][13], // 对应FSTOCKPLACEID
			HPlanMode = _saveObj[0][14], // 对应FPLANMODE
			HUseFlag = "未检验",
			HMakeTime = _saveObj[0][15], // 对应FCREATEDATE
			HMinPickQty = 0,
			HCREATEORGID = _saveObj[0][16], // 对应FCREATEORGID
			HUSEORGID = _saveObj[0][17], // 对应FUSEORGID
			HBatchManager = (bool)_saveObj[0][18] ? 1 : 0, // 对应FISBATCHMANAGE
			HCHECKINCOMING = (bool)_saveObj[0][19] ? 1 : 0, // 对应FCheckIncoming
			HAuxPropFlag = (bool)_saveObj[0][20] ? 1 : 0, // 对应FIsEnable1
			HISKFPERIOD = (bool)_saveObj[0][21] ? 1 : 0, // 对应FIsKFPeriod
			HAuxUnitID = _saveObj[0][22], // 对应FAuxUnitID
			HSNUnitID = _saveObj[0][23], // 对应FSNUNIT
			HBASEUNITID = _saveObj[0][24], // 对应FBaseUnitId
			HSALEUNITID = _saveObj[0][25], // 对应FSaleUnitId
			HSALEPRICEUNITID = _saveObj[0][26], // 对应FSalePriceUnitId
			HPERUNITSTANDHOUR = _saveObj[0][27], // 对应FPerUnitStandHour
			HSTDLABORPREPARETIME = _saveObj[0][28], // 对应FStdLaborPrePareTime
			HSTDMACHINEPREPARETIME = _saveObj[0][29] // 对应FStdMachinePrepareTime
			};
			#endregion
			// 删除主表对应数据
			@@ -1573,7 +3573,7 @@
			,HPERUNITSTANDHOUR,HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME
			)
			values
			({jsonData.HItemID},{jsonData.HERPItemID},'{jsonData.HNumber}','{jsonData.HName}','{jsonData.HModel}',
			({jsonData.HItemID},{jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}','{jsonData.HModel}',
			'{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}',{jsonData.HMaterClsID},{jsonData.HUnitID},{jsonData.HUnitGroupID},{jsonData.HLength},{jsonData.HWidth},{jsonData.HHeight},{jsonData.HJQty},{jsonData.HMQty},'{jsonData.HOldMaterNumber}',{jsonData.HWHID},{jsonData.HSPID},'{jsonData.HPlanMode}','{jsonData.HUseFlag}','{jsonData.HMakeTime}',{jsonData.HMinPickQty},{jsonData.HCREATEORGID},{jsonData.HUSEORGID},'{jsonData.HBatchManager}',{jsonData.HCHECKINCOMING},{jsonData.HAuxPropFlag},{jsonData.HISKFPERIOD},{jsonData.HAuxUnitID},{jsonData.HSNUnitID},{jsonData.HBASEUNITID},{jsonData.HSALEUNITID},{jsonData.HSALEPRICEUNITID},{jsonData.HPERUNITSTANDHOUR},'{jsonData.HSTDLABORPREPARETIME}','{jsonData.HSTDMACHINEPREPARETIME}')";

			oCN.RunProc(sql);
			@@ -1689,6 +3689,26 @@
			}
			if (IsAudit == 0) //审核提交
			{
			//审核前控制=========================================
			ds = oCN.RunProcReturn("Exec h_p_Sc_MouldStockBill_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Sc_MouldStockBill_BeforeCheckCtrl");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核前判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================

			//审核提交
			if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			@@ -1706,9 +3726,50 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			//审核后控制=========================================
			DataSet ds2 = oCN.RunProcReturn("Exec h_p_Sc_MouldStockBill_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Sc_MouldStockBill_AfterCheckCtrl");

			if (ds2 == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核后判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================
			}
			if (IsAudit == 1) //反审核提交
			{
			//反审核前控制=========================================
			ds = oCN.RunProcReturn("Exec h_p_Sc_MouldStockBill_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Sc_MouldStockBill_BeforeUnCheckCtrl");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核前判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================

			//反审核提交AbandonCheck
			if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			@@ -1726,6 +3787,29 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			//反审核后控制=========================================
			DataSet ds2 = oCN.RunProcReturn("Exec h_p_Sc_MouldStockBill_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Sc_MouldStockBill_AfterUnCheckCtrl");
			if (ds2 == null)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核后判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================

			}
			return objJsonResult;
			}
			@@ -1734,6 +3818,154 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 模具案关闭/反关闭功能
			[Route("Gy_Mould/CloseGy_Mould")]
			[HttpGet]
			public object CloseGy_Mould(string HInterID, int Type, string user)
			{
			try
			{
			//判断是否有删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_MouldFile_Close", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;
			DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
			oCN.BeginTran();//开始事务

			//Type 1 关闭 2 反关闭
			if (Type == 1)
			{
			if (!oBill.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			if (!oBill.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			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

			#region 模具档案作废/反作废功能
			[Route("Gy_Mould/DeleteGy_Mould")]
			[HttpGet]
			public object DeleteGy_Mould(string HInterID, int Type, string user)
			{
			try
			{
			//判断是否有删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_MouldFile_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
			ClsPub.CurUserName = user;

			oCN.BeginTran();//开始事务

			//Type 1 作废 2 反作废
			if (Type == 1)
			{
			if (!oBill.Cancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			if (!oBill.AbandonCancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			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;
			}
			@@ -1859,5 +4091,769 @@
			public string msg { get; set; } //末级标志

			}
			#region 物料文件上传处理
			[Route("Gy_Mater/UploadFile")]
			[HttpPost]
			public object UploadFile()
			{

			string HNumber = HttpContext.Current.Request.Params["HNumber"]; //物料代码
			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/Material/" + HNumber);
			//string path = @"D:\\Files\Material\\"+ HBillNo;
			dynamic dyResult = UpLoadFile(files, path, HNumber, 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 HNumber, 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 ='" + HNumber + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
			if (Directory.Exists(path))
			{
			File.Delete(fileurl); //删除指定文件
			files.SaveAs(fileurl);
			string StrPath = "/files/Material/" + HNumber + "/" + 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 + "','" + HNumber +
			"') ");
			}
			else
			{
			Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
			}
			}
			else
			{
			Directory.CreateDirectory(fileSavePath); //添加文件夹
			files.SaveAs(fileurl);
			string StrPath = "/files/Material/" + HNumber + "/" + 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 + "','" + HNumber +
			"') ");
			}
			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_Mater/Filelist")]
			[HttpGet]
			public object Filelist(string HNumber)
			{
			var url = fileip + "/files/Material/" + HNumber + "/";
			//@"C:\\files\\"
			try
			{
			ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HNumber + "'", "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_Mater/DeleteFilelist")]
			[HttpGet]
			public object 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/Material/" + 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;
			}
			}
			#endregion

			#region 器具档案文件导入保存
			#region 器具档案文件上传
			[Route("Gy_MouldFile/Gy_MouldFile_Excel")]
			[HttpPost]
			public object Gy_Mould_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("HMaterID", typeof(Int32));//物料ID
			tb2.Columns.Add("HMouldTypeID", typeof(Int32));//分类ID
			tb2.Columns.Add("HUnitID", typeof(Int32));//单位ID
			tb2.Columns.Add("HDeptID", typeof(Int32));//部门ID
			tb2.Columns.Add("HWHID", typeof(Int32));//仓库ID
			tb2.Columns.Add("HSupID", typeof(Int32));//供应商ID
			tb2.Columns.Add("HSPID", typeof(Int32));//仓位ID
			tb2.Columns.Add("HMadeSupID", 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("辅助属性1"))
			error += "没有找到【辅助属性1】的标题,";

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

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

			if (!tb2.Columns.Contains("对应ERP物料代码"))
			error += "没有找到【对应ERP物料代码】的标题,";

			if (!tb2.Columns.Contains("对应ERP物料"))
			error += "没有找到【对应ERP物料】的标题,";

			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 (!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 HMouldName = "";
			string HMouldNum = "";
			string HORGNumber = "";
			string HORGName = "";
			string HMaterNumber = "";
			string HMaterName = "";
			string HUnitName = "";
			string HDeptName = "";
			string HWHName = "";
			string HSPName = "";
			string HSupName = "";
			string HSupNumber = "";
			string HMadeSupName = "";
			string HMouldTypeName = "";

			HMouldName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["器具名称"].ToString());
			HMouldNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["器具编号"].ToString());
			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());
			HMaterNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["对应ERP物料代码"].ToString());
			HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["对应ERP物料"].ToString());
			HUnitName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["计量单位"].ToString());
			HDeptName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["使用部门"].ToString());
			HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓库"].ToString());
			HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓位"].ToString());
			HSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商"].ToString());
			HSupNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商代码"].ToString());
			HMadeSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["制造商"].ToString());
			HMouldTypeName = 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_MouldType where HName='" + HMouldTypeName + "' ", "Gy_MouldType");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,分类:" + HMouldTypeName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HMouldTypeID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询物料
			ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + HMaterNumber + "' and HUSEORGID=" + HORGid + "", "Gy_Department");

			if (ds.Tables[0].Rows.Count == 0 && HMaterNumber != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,物料:" + HMaterName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (HMaterNumber == "")
			{
			tb2.Rows[i]["HMaterID"] = 0;
			}
			else
			{
			tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询单位
			ds = oCN.RunProcReturn("select * from Gy_Unit where HName='" + HUnitName + "' and HUSEORGID=" + HORGid + "", "Gy_Unit");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,单位:" + HUnitName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询部门
			ds = oCN.RunProcReturn("select * from Gy_Department where HName='" + HDeptName + "' and HUSEORGID=" + HORGid + "", "Gy_Department");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,部门:" + HDeptName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询仓库
			ds = oCN.RunProcReturn("select * from Gy_Warehouse where HName='" + HWHName + "' and HUSEORGID=" + HORGid + "", "Gy_Warehouse");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,仓库:" + HWHName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HWHID = tb2.Rows[i]["HWHID"].ToString();
			//查询仓位
			ds = oCN.RunProcReturn("select * from Gy_StockPlace where HName='" + HSPName + "'and HSPGroupID=" + HWHID+ " and HUSEORGID=" + HORGid + "", "Gy_Warehouse");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,仓位:" + HSPName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HSPID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询供应商
			ds = oCN.RunProcReturn("select * from Gy_Supplier where HNumber='" + HSupNumber + "' and HUSEORGID=" + HORGid + "", "Gy_Supplier");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,供应商:" + HSupName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//查询制造商
			ds = oCN.RunProcReturn("select * from Gy_Supplier where HName='" + HMadeSupName + "' and HUSEORGID=" + HORGid + "", "Gy_Supplier");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,制造商:" + HMadeSupName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HMadeSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}

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

			//器具档案代码
			if (HMouldNum == "")
			{
			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_MouldFile/Gy_MouldFile_btnSave")]
			[HttpPost]
			public object Gy_Mould_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_MouldFile_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 BillType = "3899";
			//得到mainid
			long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			string HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true); ;//递入type得到的单据号
			DateTime HDate = DateTime.Now;//日期
			int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
			double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			string HMouldNo = item["器具编号"].ToString();
			string HBarCode = item["条形码"].ToString();
			string HName = item["器具名称"].ToString();
			string HModel = item["器具规格"].ToString();
			string HModel2 = item["器具型号"].ToString();
			string HDiameter = "";//直径
			string HSubjoin = item["辅助属性1"].ToString();
			string HSubjoin2 = item["辅助属性2"].ToString();
			string HPICNo = item["图号"].ToString();
			string HWorkMaterModel = "";//生产产品型号
			long HMaterID = int.Parse(item["HMaterID"].ToString());
			long HMouleTypeID = int.Parse(item["HMouldTypeID"].ToString());
			long HUnitID = int.Parse(item["HUnitID"].ToString());
			DateTime HOutComDate = DateTime.Now;
			string HOutComNo = item["器具出厂编号"].ToString();
			long HDeptID = int.Parse(item["HDeptID"].ToString());
			long HSupID = int.Parse(item["HSupID"].ToString());
			string HMouldStatus = item["状态"].ToString();
			long HWHID = int.Parse(item["HWHID"].ToString());
			long HRoutingID = 0;//工艺路线id
			long HBOMID = 0;
			string HVersion = "";//版本
			long HSPGroupID = 0;//默认仓位组
			long HSPID = int.Parse(item["HSPID"].ToString());//仓位id
			Double HDesignLife = item["设计寿命"].ToString()=="" ? 0: double.Parse(item["设计寿命"].ToString());
			Double HUseLife = item["使用寿命"].ToString() == "" ? 0 : double.Parse(item["使用寿命"].ToString());
			Double HInitLife = 0;//上线初始化寿命
			Double HLeaveLife = 0;//剩余寿命
			Double HProdQty = 0;//已生产数量
			Double HProdWeight = 0;//已生产重量
			string HRemark = item["备注"].ToString();
			string HMaker = user;
			string HMaterNumber = item["对应ERP物料代码"].ToString();
			string HSupNumber = item["供应商代码"].ToString();
			long HPrintQty = 0;//已生产数量
			string HMouldOWNER = "自费";//货主类型
			string HSaveLife = "";//安全寿命
			int HCaveQty = item["穴数"].ToString() == "" ? 0 : int.Parse(item["穴数"].ToString());
			int HMouldDotCheckRuleInterID = 0;
			int HMouldMaintainRuleInterID = 0;
			int HNowSupID = 0;//虚拟仓
			int HNowSupTypeID = 0;
			int HMadeSupID = 0;
			string HMouldClass = "模具";//器具类型
			int HNowWHID = 0;
			int HNowSPID = 0;


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

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

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

			oCN.RunProc("Insert Into Gy_MouldFileMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
			",HMouldNo,HName,HModel,HModel2,HDiameter" +
			",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
			",HMaterID,HMaterNumber,HMouldType,HUnitID" +
			",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
			",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
			",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
			",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
			",HMouldClass,HNowWHID,HNowSPID,HInitLife) " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
			",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
			",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
			"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
			",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
			"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
			"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
			",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
			",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "') ");
			}
			else
			{
			oCN.RunProc("UpDate Gy_MouldFileMain set " +
			//" HBillNo='" + HBillNo + "'" + //固定赋值===============
			//",HDate='" + HDate + "'" +
			//",HYear='" + HYear.ToString() + "'" +
			//",HPeriod='" + HPeriod.ToString() + "'" +
			"HRemark='" + HRemark + "'" +
			",HUpDater='" + user + "'" +
			",HUpDateDate=getdate()" +
			//========================================
			//",HMouldNo='" + HMouldNo + "'" +
			",HName='" + HName + "'" +
			",HModel='" + HModel + "'" +
			",HModel2='" + HModel2 + "'" +
			",HDiameter='" + HDiameter + "'" +
			",HSubjoin='" + HSubjoin + "'" +
			",HSubjoin2='" + HSubjoin2 + "'" +
			",HPICNo='" + HPICNo + "'" +
			",HWorkMaterModel='" + HWorkMaterModel + "'" +
			",HMaterID=" + HMaterID.ToString() +
			",HMaterNumber='" + HMaterNumber + "'" +
			",HMouldClass='" + HMouldClass + "'" +
			",HMouldType=" + HMouleTypeID.ToString() +
			",HUnitID=" + HUnitID.ToString() +
			",HOutComDate='" + HOutComDate + "'" +
			",HOutComNo='" + HOutComNo + "'" +
			",HDeptID=" + HDeptID.ToString() +
			",HSupID=" + HSupID.ToString() +
			",HSupNumber='" + HSupNumber + "'" +
			",HPrintQty=" + HPrintQty.ToString() +
			",HMouldStatus='" + HMouldStatus + "'" +
			",HSaveLife='" + HSaveLife + "'" +
			",HWhID=" + HWHID.ToString() +
			",HRoutingID=" + HRoutingID.ToString() +
			",HBomID=" + HBOMID.ToString() +
			",HVersion='" + HVersion + "'" +
			",HSPGroupID=" + HSPGroupID.ToString() +
			",HSPID=" + HSPID.ToString() +
			",HDesignLife=" + HDesignLife.ToString() +
			",HCaveQty=" + HCaveQty.ToString() +
			",HUseLife=" + HUseLife.ToString() +
			",HLeaveLife=" + HLeaveLife.ToString() +
			",HProdQty=" + HProdQty.ToString() +
			",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
			",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
			",HMouldOWNER='" + HMouldOWNER + "'" +
			",HNowSupID=" + HNowSupID.ToString() +
			",HNowSupTypeID=" + HNowSupTypeID.ToString() +
			",HProdWeight=" + HProdWeight.ToString() +
			",HBarCode='" + HBarCode.ToString() + "'" +
			",HMadeSupID=" + HMadeSupID +
			",HNowWHID=" + HNowWHID +
			",HNowSPID=" + HNowSPID +
			",HInitLife='" + HInitLife +
			"' where HMouldNo='" + HMouldNo.ToString()+"'");
			}

			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

			}
			}