MES-WEB-API.git

			@@ -309,10 +309,10 @@
			{
			try
			{
			ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
			ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "' order by HOrder", "Xt_ModuleButtonSet");
			if (ds.Tables[0].Rows.Count == 0)
			{
			ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "'", "Xt_ModuleButtonSet");
			ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "' order by HOrder", "Xt_ModuleButtonSet");

			if (ds.Tables[0].Rows.Count != 0)
			{
			@@ -346,6 +346,7 @@
			public string BtnID;
			public string BtnName;
			public bool IsHide;
			public string HOtherName;
			}
			public class noEditList
			{
			@@ -356,6 +357,7 @@
			public int HOrder;
			public bool HHideFlag;
			public bool HEditFlag;
			public string HOtherName;
			}

			[Route("Xt_ModuleButtonSet_WMES/AddModuleButtonSetWMES")]
			@@ -417,6 +419,7 @@
			string HButtonID = HButtonIDLists[j].ToString();
			string HButtonName = HButtonNameLists[j].ToString();
			int HOrder = HOrderLists[j];
			string HOtherName = button[i].HOtherName;
			if (button[i].IsHide)
			{
			HHideFlag = 1;
			@@ -426,7 +429,7 @@
			HEditFlag = 0;
			HHideFlag = 0;
			}
			string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
			string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
			oCN.RunProc(sql);
			}
			}
			@@ -444,7 +447,8 @@
			string HButtonID = noEditLists[i].HButtonID;
			string HButtonName = noEditLists[i].HButtonName;
			int HOrder = HOrderLists[j];
			string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
			string HOtherName = noEditLists[i].HOtherName;
			string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
			oCN.RunProc(sql);
			}
			}
			@@ -706,5 +710,189 @@
			}
			}
			#endregion

			#region 基础资料获取数据
			[Route("Gy_GetBaseData/Gy_GetBaseData")]
			[HttpGet]
			public object Gy_GetBaseData(string sql,string tableView, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();


			ds = oCN.RunProcReturn(sql, tableView);

			//添加列名
			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)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 单据翻译初始化查询
			[Route("Xt_grdAlignment_WMES/SelectMESLanguage")]
			[HttpGet]
			public object SelectMESLanguage(string sWhere)
			{
			try
			{
			//获取公共数据的数量
			int count = 0;
			DataSet dataSet = oCN.RunProcReturn("select * from h_v_Xt_LanModuleList where 1=1 and HModuleCode in('GYModel')", "h_v_Xt_LanModuleList");
			if (dataSet.Tables[0].Rows.Count > 0)
			{
			count = dataSet.Tables[0].Rows.Count;
			}

			//根据单据模块名称和翻译类型去模块表里查询如果没有数据就新增,如果有数据就不保存

			ds = oCN.RunProcReturn("select * from h_v_Xt_LanModuleList where 1=1 " + sWhere, "h_v_Xt_LanModuleList");

			objJsonResult.code = "1";
			objJsonResult.count = count;
			objJsonResult.Message = "";
			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("Xt_grdAlignment_WMES/SaveMESLanguage")]
			[HttpPost]
			public object SaveMESLanguage([FromBody] JObject sMainSub)
			{
			try
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0];
			string HModName = sArray[1];
			//如果没有数据就新增,如果有数据就不保存
			//通过,进行分组
			string[] data = msg2.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);

			oCN.BeginTran();

			string HBillType = "3033";
			long HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
			//定义一个空集合去判断是否有重复的id
			string[] list = new string[data.Length];

			//判断是否跟公共字段重复
			ds = oCN.RunProcReturn(" select * from h_v_Xt_LanModuleList where HModuleCode='GYModel'", "h_v_Xt_LanModuleList");
			string[] Datalist = new string[ds.Tables[0].Rows.Count];

			if (ds.Tables[0].Rows.Count > 0)
			{
			for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
			{
			Datalist[i] = ds.Tables[0].Rows[i]["HFieldCode"].ToString() + ds.Tables[0].Rows[i]["HFieldName"].ToString();
			}
			}

			//定义一个 num 去定义当前的索引
			int num = 0;

			for (int i = 0; i < data.Length; i++)
			{
			string[] Lable = data[i].Split(new string[] { "\|" }, StringSplitOptions.RemoveEmptyEntries);

			if (Lable.Length == 3) {

			string HFieldCode = Lable[0];
			string HFieldName = Lable[1];
			string HFieldModelType = Lable[2];

			if (!list.Contains(HFieldCode + HFieldName) && !Datalist.Contains(HFieldCode + HFieldName))
			{

			list[num] = HFieldCode + HFieldName;
			num += 1;

			oCN.RunProc("insert into Xt_LanModuleSub(HInterID,HEntryID,HFieldModelType,HFieldCode,HFieldName)" +
			"values(" + HInterID + "," + num + ",'" + HFieldModelType + "','" + HFieldCode + "','" + HFieldName + "')");
			}
			}
			}

			oCN.RunProc("insert into Xt_LanModuleMain(HInterID,HBillType,HModuleName,HModuleCode)" +
			"values(" + HInterID + ",'" + HBillType + "','','" + HModName + "')");

			oCN.Commit();

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

			#region 报错信息查询
			[Route("Xt_grdAlignment_WMES/SelectMessageError")]
			[HttpGet]
			public object SelectMessageError(string ErrorCode)
			{
			try
			{
			ds = oCN.RunProcReturn("select * from Xt_MessageError where HErrorCode='" + ErrorCode + "'", "Xt_MessageError");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			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
			}
			}