From f330d41697dc8b2fbbd879ce8a9b644dab7cc31c Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 十二月 2023 17:04:59 +0800
Subject: [PATCH] 1.设备基础资料,设备点检项目、设备点检标准导入接口
---
VueWebCoreApi/Tools/ExcelList.cs | 8
VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs | 18 +-
VueWebCoreApi/wwwroot/Excel/设备点检标准.xls | 0
VueWebCoreApi/wwwroot/Excel/设备点检项目.xls | 0
VueWebCoreApi/Tools/ImportExcelData.cs | 232 ++++++++++++++++++++--------------------------
VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs | 2
6 files changed, 115 insertions(+), 145 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
index 1ff294c..ee9293d 100644
--- a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
@@ -1792,7 +1792,7 @@
try
{
//鑾峰彇宸ヤ綔绔欓泦鍚�(杞﹂棿,鍖呭惈宸茬粦瀹氬伐浣滅珯鏍囪瘑)
- sql = @"select distinct E.torg_code,T.torg_name as wksp_name,'E' as type,(case when B.wksp_code is null then 'N' else 'Y' end) flag
+ sql = @"select distinct E.torg_code as wksp_code,T.torg_name as wksp_name,'E' as type,(case when B.wksp_code is null then 'N' else 'Y' end) flag
from TEqpInfo E
left join TOrganization T on E.torg_code=T.torg_code
left join(
diff --git a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
index b33f3d0..247a061 100644
--- a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
@@ -51,10 +51,10 @@
Message = ImportExcelData.Nine(dataTable, out StuCode);
break;
case "10"://璁惧鐐规椤圭洰
- Message = ImportExcelData.Ten(savePath, out StuCode);
+ Message = ImportExcelData.Ten(dataTable, out StuCode);
break;
- case "22"://璁惧鐐规鏍囧噯
- Message = ImportExcelData.TwentyTwo(savePath, out StuCode);
+ case "10_1"://璁惧鐐规鏍囧噯
+ Message = ImportExcelData.Ten_one(dataTable, out StuCode);
break;
case "11"://璁惧淇濆吇椤圭洰
Message = ImportExcelData.Eleven(savePath, out StuCode);
@@ -155,10 +155,10 @@
list = ImportExcelData.NineData(dataTable, out stuCode, out message, out count);
break;
case "10"://璁惧鐐规椤圭洰
- list = ImportExcelData.TenData(savePath, out stuCode, out message, out count);
+ list = ImportExcelData.TenData(dataTable, out stuCode, out message, out count);
break;
- case "22"://璁惧鐐规鏍囧噯
- list = ImportExcelData.TwentyTwoData(savePath, out stuCode, out message, out count);
+ case "10_1"://璁惧鐐规鏍囧噯
+ list = ImportExcelData.Ten_oneData(dataTable, out stuCode, out message, out count);
break;
case "11"://璁惧淇濆吇椤圭洰
list = ImportExcelData.ElevenData(savePath, out stuCode, out message, out count);
@@ -251,10 +251,10 @@
Message = ImportExcelData.NineSubmit(dataTable, us, out StuCode);
break;
case "10"://璁惧鐐规椤圭洰
- Message = ImportExcelData.TenSubmit(savePath, User, out StuCode);
+ Message = ImportExcelData.TenSubmit(dataTable, us, out StuCode);
break;
- case "22"://璁惧鐐规鏍囧噯
- Message = ImportExcelData.TwentyTwoSubmit(savePath, User, out StuCode);
+ case "10_1"://璁惧鐐规鏍囧噯
+ Message = ImportExcelData.Ten_oneSubmit(dataTable, us, out StuCode);
break;
case "11"://璁惧淇濆吇椤圭洰
Message = ImportExcelData.ElevenSubmit(savePath, User, out StuCode);
diff --git a/VueWebCoreApi/Tools/ExcelList.cs b/VueWebCoreApi/Tools/ExcelList.cs
index a8556a7..78cbdec 100644
--- a/VueWebCoreApi/Tools/ExcelList.cs
+++ b/VueWebCoreApi/Tools/ExcelList.cs
@@ -22,10 +22,10 @@
//new ScoreReport("7","搴撲綅璁剧疆"),
new ScoreReport("8","瀛樿揣妗ｆ"),
new ScoreReport("9","璁惧娓呭崟"),
- //new ScoreReport("10","璁惧鐐规椤圭洰"),
- //new ScoreReport("22","璁惧鐐规鏍囧噯"),
- //new ScoreReport("11","璁惧淇濆吇椤圭洰"),
- //new ScoreReport("23","璁惧淇濆吇鏍囧噯"),
+ new ScoreReport("10","璁惧鐐规椤圭洰"),
+ new ScoreReport("10_1","璁惧鐐规鏍囧噯"),
+ new ScoreReport("11","璁惧淇濆吇椤圭洰"),
+ new ScoreReport("11_1","璁惧淇濆吇鏍囧噯"),
new ScoreReport("12","妯″叿娓呭崟"),
new ScoreReport("13","妯″叿鐐规椤圭洰"),
new ScoreReport("13_1","妯″叿鐐规鏍囧噯"),
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 8d2194d..4d3d702 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -690,59 +690,51 @@
#endregion
#region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规椤圭洰妯℃澘銆�
- public static string Ten(string FileCode, out string code)
+ public static string Ten(List<DataTable> excelTable, out string code)
{
string Message = "";
code = "";
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToTableList(FileCode);
- if (excelTable.Count != 2)
+ if (excelTable.Count != 1)
{
- code = "300";
+ code = "301";
Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
return Message;
}
- else if (excelTable[0].Columns.Count != 6)
+ else if (excelTable[0].Columns.Count != 5)
{
- code = "300";
+ code = "301";
Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
return Message;
}
- else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[0].Columns[0].ColumnName != "*鐐规椤圭洰缂栧彿(鍞竴)")
{
- code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+ code = "301";
+ Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*鐐规椤圭洰缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "鐐规椤圭洰缂栧彿(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "*鐐规椤圭洰鍚嶇О")
{
- code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕鐐规椤圭洰缂栧彿(鍞竴)}";
+ code = "301";
+ Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*鐐规椤圭洰鍚嶇О}";
return Message;
}
- else if (excelTable[0].Columns[2].ColumnName != "鐐规椤圭洰鍚嶇О")
+ else if (excelTable[0].Columns[2].ColumnName != "*鐐规鍛ㄦ湡")
{
- code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕鐐规椤圭洰鍚嶇О}";
+ code = "301";
+ Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鐐规鍛ㄦ湡}";
return Message;
}
- else if (excelTable[0].Columns[3].ColumnName != "鐐规鍛ㄦ湡")
+ else if (excelTable[0].Columns[3].ColumnName != "*鏄惁鎵爜")
{
- code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规鍛ㄦ湡}";
+ code = "301";
+ Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鏄惁鎵爜}";
return Message;
}
- else if (excelTable[0].Columns[4].ColumnName != "鏄惁鎵爜")
+ else if (excelTable[0].Columns[4].ColumnName != "鐐规椤圭洰瑕佹眰")
{
- code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
- return Message;
- }
- else if (excelTable[0].Columns[5].ColumnName != "鐐规椤圭洰瑕佹眰")
- {
- code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规椤圭洰瑕佹眰}";
+ code = "301";
+ Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鐐规椤圭洰瑕佹眰}";
return Message;
}
else
@@ -755,107 +747,93 @@
#endregion
#region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规鏍囧噯妯℃澘銆�
- public static string TwentyTwo(string FileCode, out string code)
+ public static string Ten_one(List<DataTable> excelTable, out string code)
{
string Message = "";
code = "";
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToTableList(FileCode);
- if (excelTable.Count != 4)
+ if (excelTable.Count != 2)
{
code = "300";
Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
return Message;
}
- else if (excelTable[0].Columns.Count != 5)
+ else if (excelTable[0].Columns.Count != 4)
{
code = "300";
Message = "璁惧鐐规鏍囧噯椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
return Message;
}
- else if (excelTable[1].Columns.Count != 8)
+ else if (excelTable[1].Columns.Count != 7)
{
code = "300";
Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
return Message;
}
- else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[0].Columns[0].ColumnName != "*璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
{
code = "300";
- Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "*璁惧鐐规鏍囧噯鍚嶇О")
{
code = "300";
- Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*璁惧鐐规鏍囧噯鍚嶇О}";
return Message;
}
- else if (excelTable[0].Columns[2].ColumnName != "璁惧鐐规鏍囧噯鍚嶇О")
+ else if (excelTable[0].Columns[2].ColumnName != "*鐐规绠℃帶")
{
code = "300";
- Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧鐐规鏍囧噯鍚嶇О}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鐐规绠℃帶}";
return Message;
}
- else if (excelTable[0].Columns[3].ColumnName != "鐐规绠℃帶")
+ else if (excelTable[0].Columns[3].ColumnName != "鏍囧噯鎻忚堪")
{
code = "300";
- Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鐐规绠℃帶}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鏍囧噯鎻忚堪}";
return Message;
}
- else if (excelTable[0].Columns[4].ColumnName != "鏍囧噯鎻忚堪")
+ else if (excelTable[1].Columns[0].ColumnName != "*鐐规椤瑰簭鍙�")
{
code = "300";
- Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鏍囧噯鎻忚堪}";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*鐐规椤瑰簭鍙穧";
return Message;
}
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[1].Columns[1].ColumnName != "*璁惧鐐规鏍囧噯缂栧彿")
{
code = "300";
- Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*璁惧鐐规鏍囧噯缂栧彿}";
return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "鐐规椤瑰簭鍙�")
+ else if (excelTable[1].Columns[2].ColumnName != "*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)")
{
code = "300";
- Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐐规椤瑰簭鍙穧";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "璁惧鐐规鏍囧噯缂栧彿")
+ else if (excelTable[1].Columns[3].ColumnName != "*璁惧鐐规閮ㄤ綅鍚嶇О")
{
code = "300";
- Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧鐐规鏍囧噯缂栧彿}";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*璁惧鐐规閮ㄤ綅鍚嶇О}";
return Message;
}
- else if (excelTable[1].Columns[3].ColumnName != "璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)")
+ else if (excelTable[1].Columns[4].ColumnName != "鐐规閮ㄤ綅瑕佹眰")
{
code = "300";
- Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鐐规閮ㄤ綅瑕佹眰}";
return Message;
}
- else if (excelTable[1].Columns[4].ColumnName != "璁惧鐐规閮ㄤ綅鍚嶇О")
+ else if (excelTable[1].Columns[5].ColumnName != "*閫夋嫨鎵爜")
{
code = "300";
- Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕璁惧鐐规閮ㄤ綅鍚嶇О}";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕*閫夋嫨鎵爜}";
return Message;
}
- else if (excelTable[1].Columns[5].ColumnName != "鐐规閮ㄤ綅瑕佹眰")
+ else if (excelTable[1].Columns[6].ColumnName != "*鐐规鍛ㄦ湡")
{
code = "300";
- Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鐐规閮ㄤ綅瑕佹眰}";
- return Message;
- }
- else if (excelTable[1].Columns[6].ColumnName != "閫夋嫨鎵爜")
- {
- code = "300";
- Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕閫夋嫨鎵爜}";
- return Message;
- }
- else if (excelTable[1].Columns[7].ColumnName != "鐐规鍛ㄦ湡")
- {
- code = "300";
- Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕鐐规鍛ㄦ湡}";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕*鐐规鍛ㄦ湡}";
return Message;
}
else
@@ -3040,7 +3018,7 @@
#endregion
#region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧鐐规椤圭洰銆�
- public static List<ExcelErro> TenData(string FileCode, out string StuCode, out string message, out int count)
+ public static List<ExcelErro> TenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
{
message = "";
@@ -3050,33 +3028,31 @@
DataTable dt;
var dynamicParams = new DynamicParameters();
List<ExcelErro> list = new List<ExcelErro>();
- DataTable excelTable = new DataTable();
- list = ImportExcel.ExcelToTableErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
- excelTable = ImportExcel.ExcelToTable(FileCode); //鑾峰彇Excel鏁版嵁
+ list = ImportExcel.InportExcelToTableListErro(excelTable); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
//褰撳墠Excel鏁版嵁涓偣妫�鏍囧噯椤电涓�,璁惧鐐规鏍囧噯缂栧彿(鍞竴鏄惁鏈夐噸澶�)
- DataTable distinct = excelTable.DefaultView.ToTable(true, "鐐规椤圭洰缂栧彿(鍞竴)");
- if (distinct.Rows.Count != excelTable.Rows.Count)
+ DataTable distinct = excelTable[0].DefaultView.ToTable(true, "*鐐规椤圭洰缂栧彿(鍞竴)");
+ if (distinct.Rows.Count != excelTable[0].Rows.Count)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
- erro.ErrorField = "{鐐规椤圭洰缂栧彿(鍞竴)}";
- erro.ErrorCont = "璁惧鐐规椤圭洰椤电妯℃澘:{鐐规椤圭洰缂栧彿(鍞竴)}鏈夐噸澶�";
+ erro.ErrorField = "{*鐐规椤圭洰缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规椤圭洰妯℃澘:{*鐐规椤圭洰缂栧彿(鍞竴)}鏈夐噸澶�";
list.Add(erro);
}
- for (int i = 0; i < excelTable.Rows.Count; i++)
+ for (int i = 0; i < excelTable[0].Rows.Count; i++)
{
- if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
+ if (excelTable[0].Rows[i][0].ToString().Trim() != null && excelTable[0].Rows[i][0].ToString().Trim() != "")
{
sql = @"select code from TEqpchk_Item where code=@code";
- dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
+ dynamicParams.Add("@code", excelTable[0].Rows[i][0].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
- erro.ErrorField = "{鐐规椤圭洰缂栧彿(鍞竴)}";
- erro.ErrorCont = "璁惧鐐规椤圭洰琛�:{鐐规椤圭洰缂栧彿(鍞竴)}瀛楁" + excelTable.Rows[i][1].ToString().Trim() + "宸插瓨鍦�";
+ erro.ErrorField = "{*鐐规椤圭洰缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规椤圭洰琛�:{*鐐规椤圭洰缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[i][0].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
@@ -3096,64 +3072,62 @@
{
StuCode = "200";
message = "鏁版嵁楠岃瘉鎴愬姛";
- count = excelTable.Rows.Count;
+ count = excelTable[0].Rows.Count;
}
return list;
}
#endregion
#region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧鐐规鏍囧噯銆�
- public static List<ExcelErro> TwentyTwoData(string FileCode, out string StuCode, out string message, out int count)
+ public static List<ExcelErro> Ten_oneData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
{
message = "";
StuCode = "";
count = 0;
string sql = "";
- var dynamicParams = new DynamicParameters();
DataTable dt;
+ var dynamicParams = new DynamicParameters();
List<ExcelErro> list = new List<ExcelErro>();
- List<DataTable> excelTable = new List<DataTable>();
- list = ImportExcel.ExcelToTableListErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
- excelTable = ImportExcel.ExcelToTableList(FileCode); //鑾峰彇Excel鏁版嵁
+ list = ImportExcel.InportExcelToTableListErro(excelTable); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
//褰撳墠Excel鏁版嵁涓偣妫�鏍囧噯椤电涓�,璁惧鐐规鏍囧噯缂栧彿(鍞竴鏄惁鏈夐噸澶�)
- DataTable distinct = excelTable[0].DefaultView.ToTable(true, "璁惧鐐规鏍囧噯缂栧彿(鍞竴)");
+ DataTable distinct = excelTable[0].DefaultView.ToTable(true, "*璁惧鐐规鏍囧噯缂栧彿(鍞竴)");
if (distinct.Rows.Count != excelTable[0].Rows.Count)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
- erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
- erro.ErrorCont = "璁惧鐐规鏍囧噯椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}鏈夐噸澶�";
+ erro.ErrorField = "{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规鏍囧噯椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}鏈夐噸澶�";
list.Add(erro);
}
//璁惧鐐规鏍囧噯琛ㄦ槸鍚﹀凡瀛樺湪鐐规鏍囧噯
for (int j = 0; j < excelTable[0].Rows.Count; j++)
{
- if (excelTable[0].Rows[j][1].ToString().Trim() != null && excelTable[0].Rows[j][1].ToString().Trim() != "")
+ if (excelTable[0].Rows[j][0].ToString().Trim() != null && excelTable[0].Rows[j][0].ToString().Trim() != "")
{
sql = @"select * from TEqpchk_Main where code=@code";
- dynamicParams.Add("@code", excelTable[0].Rows[j][1].ToString().Trim());
+ dynamicParams.Add("@code", excelTable[0].Rows[j][0].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
- erro.ErrorCont = "璁惧鐐规鏍囧噯琛�:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][1].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+ erro.ErrorCont = "璁惧鐐规鏍囧噯琛�:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][0].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
list.Add(erro);
}
//閫氳繃璁惧鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ璁惧鐐规閮ㄤ綅椤电妯℃澘涓搴旂殑鏁版嵁淇℃伅
- var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["璁惧鐐规鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][1].ToString().Trim());
+ 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, "璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)");
+ 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][2].ToString().Trim() + " 瀵瑰簲{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
+ erro.ErrorField = "{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 瀵瑰簲{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
list.Add(erro);
}
}
@@ -3161,8 +3135,8 @@
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
- erro.ErrorField = "{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
- erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 鍦ㄨ澶囩偣妫�鏍囧噯椤电妯℃澘涓笉瀛樺湪";
+ erro.ErrorField = "{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 鍦ㄨ澶囩偣妫�鏍囧噯椤电妯℃澘涓笉瀛樺湪";
list.Add(erro);
}
}
@@ -3170,17 +3144,17 @@
//褰撳墠Excel鏁版嵁涓偣妫�閮ㄤ綅椤电涓�,璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)鍦ㄨ澶囩偣妫�閮ㄤ綅琛ㄤ腑鏄惁瀛樺湪
for (int k = 0; k < excelTable[1].Rows.Count; k++)
{
- if (excelTable[1].Rows[k][3].ToString().Trim() != null && excelTable[1].Rows[k][3].ToString().Trim() != "")
+ if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
{
sql = @"select * from TEqpchk_Item where code=@code";
- dynamicParams.Add("@code", excelTable[1].Rows[k][3].ToString().Trim());
+ dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count < 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
- erro.ErrorField = "{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
- erro.ErrorCont = "璁惧鐐规閮ㄤ綅琛�:{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ erro.ErrorField = "{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规閮ㄤ綅琛�:{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
list.Add(erro);
}
}
@@ -3189,7 +3163,7 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
+ select rr.Field<string>("*璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
).Contains(r.Field<string>("璁惧鐐规鏍囧噯缂栧彿"))
select r;
List<DataRow> listRow = dt3.ToList();
@@ -3198,7 +3172,7 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿}";
- erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+ erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
list.Add(erro);
}
if (list.Count > 0)
@@ -5028,7 +5002,7 @@
#endregion
#region銆怑xcel鏁版嵁涓婁紶,璁惧鐐规椤圭洰銆�
- public static string TenSubmit(string FileCode, string User, out string StuCode)
+ public static string TenSubmit(List<DataTable> excelTable, User us, out string StuCode)
{
string message = "";
StuCode = "";
@@ -5038,13 +5012,11 @@
try
{
list.Clear();
- DataTable excelTable = new DataTable();
- excelTable = ImportExcel.ExcelToTable(FileCode);
//瀵煎叆璁惧鐐规椤圭洰琛�
- for (int i = 0; i < excelTable.Rows.Count; i++)
+ for (int i = 0; i < excelTable[0].Rows.Count; i++)
{
string Type = "", IsScan = "";
- switch (excelTable.Rows[i][3].ToString().Trim())
+ switch (excelTable[0].Rows[i][2].ToString().Trim())
{
case "骞�":
Type = "Y";
@@ -5064,7 +5036,7 @@
default:
break;
}
- switch (excelTable.Rows[i][4].ToString().Trim())
+ switch (excelTable[0].Rows[i][3].ToString().Trim())
{
case "鏄�":
IsScan = "Y";
@@ -5082,12 +5054,12 @@
str = sql,
parm = new
{
- code = excelTable.Rows[i][1].ToString().Trim(),
- name = excelTable.Rows[i][2].ToString().Trim(),
- descr = excelTable.Rows[i][5].ToString().Trim(),
+ code = excelTable[0].Rows[i][0].ToString().Trim(),
+ name = excelTable[0].Rows[i][1].ToString().Trim(),
+ descr = excelTable[0].Rows[i][4].ToString().Trim(),
isscan = IsScan,
cycle = Type,
- Operator = User,
+ Operator = us.usercode,
CreateDate = DateTime.Now.ToString()
}
});
@@ -5114,7 +5086,7 @@
#endregion
#region銆怑xcel鏁版嵁涓婁紶,璁惧鐐规鏍囧噯銆�
- public static string TwentyTwoSubmit(string FileCode, string User, out string StuCode)
+ public static string Ten_oneSubmit(List<DataTable> excelTable, User us, out string StuCode)
{
string message = "";
StuCode = "";
@@ -5124,8 +5096,6 @@
try
{
list.Clear();
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToTableList(FileCode);
//瀵煎叆璁惧鐐规鏍囧噯涓昏〃
for (int k = 0; k < excelTable[0].Rows.Count; k++)
{
@@ -5136,12 +5106,12 @@
str = sql,
parm = new
{
- code = excelTable[0].Rows[k][1].ToString().Trim(),
- name = excelTable[0].Rows[k][2].ToString().Trim(),
- iscontr = excelTable[0].Rows[k][3].ToString().Trim(),
- description = excelTable[0].Rows[k][4].ToString().Trim(),
+ code = excelTable[0].Rows[k][0].ToString().Trim(),
+ name = excelTable[0].Rows[k][1].ToString().Trim(),
+ iscontr = excelTable[0].Rows[k][2].ToString().Trim(),
+ description = excelTable[0].Rows[k][3].ToString().Trim(),
CreateDate = DateTime.Now.ToString(),
- Operator = User
+ Operator = us.usercode
}
});
}
@@ -5149,7 +5119,7 @@
for (int i = 0; i < excelTable[1].Rows.Count; i++)
{
string Type = "";
- switch (excelTable[1].Rows[i][7].ToString().Trim())
+ switch (excelTable[1].Rows[i][6].ToString().Trim())
{
case "鏃�":
Type = "D";
@@ -5164,14 +5134,14 @@
str = sql,
parm = new
{
- seq = excelTable[1].Rows[i][1].ToString().Trim(),
- code = excelTable[1].Rows[i][3].ToString().Trim(),
- name = excelTable[1].Rows[i][4].ToString().Trim(),
- eqpchk_main_code = excelTable[1].Rows[i][2].ToString().Trim(),
- description = excelTable[1].Rows[i][5].ToString().Trim(),
- isscan = excelTable[1].Rows[i][6].ToString().Trim(),
+ seq = excelTable[1].Rows[i][0].ToString().Trim(),
+ code = excelTable[1].Rows[i][2].ToString().Trim(),
+ name = excelTable[1].Rows[i][3].ToString().Trim(),
+ eqpchk_main_code = excelTable[1].Rows[i][1].ToString().Trim(),
+ description = excelTable[1].Rows[i][4].ToString().Trim(),
+ isscan = excelTable[1].Rows[i][5].ToString().Trim(),
cycle = Type,
- Operator = User,
+ Operator = us.usercode,
CreateDate = DateTime.Now.ToString()
}
});
diff --git "a/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls" "b/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls"
index a9ff9f3..6b246c1 100644
--- "a/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls"
+++ "b/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls"
Binary files differ
diff --git "a/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\351\241\271\347\233\256.xls" "b/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\351\241\271\347\233\256.xls"
index 6dc00bd..1e52556 100644
--- "a/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\351\241\271\347\233\256.xls"
+++ "b/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\351\241\271\347\233\256.xls"
Binary files differ
--
Gitblit v1.9.3