JTAPI.git - Gitblit

			@@ -2502,19 +2502,28 @@
			list.Add(erro);
			}
			//通过设备点检标准页签模板中的标准编码查询设备点检部位页签模板中对应的数据信息
			DataTable ds = excelTable[1].AsEnumerable().Where<DataRow>(C => C["设备点检标准编号"].ToString() == excelTable[0].Rows[j][1].ToString().Trim()).CopyToDataTable();
			if (ds.Rows.Count > 0)
			var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["设备点检标准编号"].ToString() == excelTable[0].Rows[j][1].ToString().Trim());
			DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
			if (ds.Rows.Count > 0)
			{
			//判断点检标准查询点检部位数据是否有重复
			//判断保养标准查询保养部位数据是否有重复
			DataTable distinct1 = ds.DefaultView.ToTable(true, "设备点检部位编号(唯一)");
			if (distinct1.Rows.Count != ds.Rows.Count)
			{
			ExcelErro erro = new ExcelErro();
			erro.RoeNumber = "/";
			erro.ErrorField = "{设备点检部位编号(唯一)}";
			erro.ErrorCont = "设备点检部位页签模板:{设备点检标准编号}:"+ excelTable[0].Rows[j][1].ToString().Trim() + " 对应{设备点检部位编号(唯一)}有重复";
			erro.ErrorCont = "设备点检部位页签模板:{设备点检标准编号}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 对应{设备点检部位编号(唯一)}有重复";
			list.Add(erro);
			}
			}
			else
			{
			ExcelErro erro = new ExcelErro();
			erro.RoeNumber = "/";
			erro.ErrorField = "{设备点检部位编号(唯一)}";
			erro.ErrorCont = "设备点检部位页签模板:{设备点检标准编号}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 在设备点检标准页签模板中不存在";
			list.Add(erro);
			}
			}
			}
			@@ -2675,7 +2684,8 @@
			list.Add(erro);
			}
			//通过设备保养标准页签模板中的标准编码查询设备保养部位页签模板中对应的数据信息
			DataTable ds = excelTable[1].AsEnumerable().Where<DataRow>(C => C["设备保养标准编号"].ToString() == excelTable[0].Rows[j][1].ToString().Trim()).CopyToDataTable();
			var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["设备保养标准编号"].ToString() == excelTable[0].Rows[j][1].ToString().Trim());
			DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
			if (ds.Rows.Count > 0)
			{
			//判断保养标准查询保养部位数据是否有重复
			@@ -2685,9 +2695,17 @@
			ExcelErro erro = new ExcelErro();
			erro.RoeNumber = "/";
			erro.ErrorField = "{设备保养部位编号(唯一)}";
			erro.ErrorCont = "设备保养部位页签模板:{设备保养标准编号}:" + excelTable[0].Rows[j][1].ToString().Trim() + " 对应{设备保养部位编号(唯一)}有重复";
			erro.ErrorCont = "设备保养部位页签模板:{设备保养标准编号}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 对应{设备保养部位编号(唯一)}有重复";
			list.Add(erro);
			}
			}
			else
			{
			ExcelErro erro = new ExcelErro();
			erro.RoeNumber = "/";
			erro.ErrorField = "{设备保养部位编号(唯一)}";
			erro.ErrorCont = "设备保养部位页签模板:{设备保养标准编号}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 在设备保养标准页签模板中不存在";
			list.Add(erro);
			}
			}
			}
			@@ -3152,26 +3170,27 @@
			list.Add(erro);
			}
			//查询母件信息对应的子件信息
			DataTable ds = excelTable[1].AsEnumerable().Where<DataRow>(C => C["主表序列号"].ToString() == excelTable[0].Rows[j][0].ToString().Trim()).CopyToDataTable();
			//for (int i = 0; i < ds.Rows.Count; i++)
			//{
			// if (excelTable[0].Rows[j][1].ToString().Trim() == ds.Rows[i]["子件编码"].ToString().Trim())
			// {
			// ExcelErro erro = new ExcelErro();
			// erro.RoeNumber = "/";
			// erro.ErrorField = "{子件编码}";
			// erro.ErrorCont = "子件信息:{子件编码}字段" + ds.Rows[i]["子件编码"].ToString().Trim() + "与对应的{母件编码}字段重复";
			// list.Add(erro);
			// }
			//}
			//判断同母件对应的子件是否重复
			DataTable distinct1 = ds.DefaultView.ToTable(true, "子件编码");
			if (distinct1.Rows.Count != ds.Rows.Count)
			var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["主表序列号"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
			DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
			if (ds.Rows.Count > 0)
			{
			//判断同母件对应的子件是否重复
			DataTable distinct1 = ds.DefaultView.ToTable(true, "子件编码");
			if (distinct1.Rows.Count != ds.Rows.Count)
			{
			ExcelErro erro = new ExcelErro();
			erro.RoeNumber = "/";
			erro.ErrorField = "{子件编码}";
			erro.ErrorCont = "物料清单对应子件信息页签模板:主表序列号：【" + excelTable[1].Rows[j]["主表序列号"].ToString() + "】对应{子件编码}有重复";
			list.Add(erro);
			}
			}
			else
			{
			ExcelErro erro = new ExcelErro();
			erro.RoeNumber = "/";
			erro.ErrorField = "{子件编码}";
			erro.ErrorCont = "物料清单对应子件信息页签模板:主表序列号：【"+ excelTable[0].Rows[j]["主表序列号"].ToString() + "】对应{子件编码}有重复";
			erro.ErrorField = "{主表序列号}";
			erro.ErrorCont = "物料清单对应子件信息页签模板:{主表序列号}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 在母件信息页签模板中不存在";
			list.Add(erro);
			}
			}
			@@ -3274,8 +3293,8 @@
			break;
			}

			sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype)
			values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype)";
			sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype,usergroup_code)
			values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype,@usergroup_code)";
			list.Add(new
			{
			str = sql,
			@@ -3290,7 +3309,8 @@
			Email = excelTable[1].Rows[i][6].ToString().Trim(),
			Operator = User,
			StuOrg = excelTable[1].Rows[i][7].ToString().Trim(),
			wagetype = WageType
			wagetype = WageType,
			usergroup_code= excelTable[1].Rows[i][9].ToString().Trim()
			}
			});
			}
			@@ -3420,24 +3440,24 @@
			//导入往来单位表
			for (int i = 0; i < excelTable.Rows.Count; i++)
			{
			string WGType = "", WXType = "", KHType = "";
			string Type = "";
			switch (excelTable.Rows[i][3].ToString().Trim())
			{
			case "外购供方":
			WGType = "WG";
			break;
			case "外协供方":
			WXType = "WX";
			case "供应商":
			Type = "226";
			break;
			case "客户":
			KHType = "KH";
			Type = "211";
			break;
			case "客户/供应商":
			Type = "228";
			break;
			default:
			break;
			}

			sql = @"insert into TCustomer(code,name,mtype,conttacts,conttphone,addr,lm_user,lm_date,btype,htype)
			values(@code,@name,@mtype,@conttacts,@conttphone,@addr,@Operator,@CreateDate,@btype,@htype)";
			sql = @"insert into TCustomer(code,name,type,conttacts,conttphone,addr,lm_user,lm_date)
			values(@code,@name,@type,@conttacts,@conttphone,@addr,@Operator,@CreateDate)";
			list.Add(new
			{
			str = sql,
			@@ -3445,14 +3465,12 @@
			{
			code = excelTable.Rows[i][1].ToString().Trim(),
			name = excelTable.Rows[i][2].ToString().Trim(),
			mtype = WGType,
			type = Type,
			conttacts = excelTable.Rows[i][4].ToString().Trim(),
			conttphone = excelTable.Rows[i][5].ToString().Trim(),
			addr = excelTable.Rows[i][6].ToString().Trim(),
			Operator = User,
			CreateDate = DateTime.Now.ToString(),
			btype = WXType,
			htype = KHType
			CreateDate = DateTime.Now.ToString()
			}
			});
			}
			@@ -3816,7 +3834,7 @@
			default:
			break;
			}
			sql = @"insert into TEqpchk_Deta(seq,code,name,eqpchk_main_code,description,isscan,cycle,lm_user,lm_date)
			sql = @"insert into TEqpchk_Deta(seq,code,name,eqpchk_main_code,chkdesc,isscan,cycle,lm_user,lm_date)
			values(@seq,@code,@name,@eqpchk_main_code,@description,@isscan,@cycle,@Operator,@CreateDate)";
			list.Add(new
			{
			@@ -3893,7 +3911,7 @@
			// default:
			// break;
			//}
			switch (excelTable.Rows[i][4].ToString().Trim())
			switch (excelTable.Rows[i][3].ToString().Trim())
			{
			case "是":
			IsScan = "Y";
			@@ -3905,7 +3923,7 @@
			break;
			}
			sql = @"insert into TEqpmai_Item(code,name,description,isscan,cycle,lm_user,lm_date)
			values(@code,@name,@descr,@Operator,@CreateDate)";
			values(@code,@name,@descr,@isscan,@cycle,@Operator,@CreateDate)";
			list.Add(new
			{
			str = sql,