MES-WEB-API.git

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

			@@ -3837,6 +3840,208 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

			i++;
			}

			oCN.Commit();

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



			#endregion

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

			/// <summary>
			/// 获取职务列表
			@@ -12934,6 +13173,14 @@
			objjson.data = null;
			return objjson;
			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "该设备有多个计划单或点检规程,手动选着" ;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			@@ -12975,19 +13222,22 @@
			switch (Type)
			{
			case "DJ":
			HView = "h_v_QJ_GetDotCheckItemList";
			HView = "h_v_Sc_MouldDotCheckPlanBillList";
			break;
			case "BY":
			HView = "h_v_Sc_MouldMaintainPlanBillList";
			break;
			default:
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "设备模块类型错误！";
			objjson.Message = "模具模块类型错误！";
			objjson.data = null;
			return objjson;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
			string sql = string.Format(@"Exec h_p_Sb_GetCheckItem_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
			string sql = string.Format(@"Exec h_p_Sb_GetCheckItemMouldFile_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
			ds = oCN.RunProcReturn(sql, HView);
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			@@ -12997,6 +13247,14 @@
			objjson.data = null;
			return objjson;
			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "该模具有多个计划单,手动选着";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";