From d11b595b22ae25e49e24f298ba2ca58528bda532 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 九月 2023 18:18:17 +0800
Subject: [PATCH] 正清河 仓库看板、车间综合看板接口
---
VueWebApi/Tools/ImportExcelData.cs | 635 +++++++++++++++++++++------------------------------------
1 files changed, 239 insertions(+), 396 deletions(-)
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index c5919a8..bb47779 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -20,20 +20,14 @@
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 != 4)
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
- return Message;
- }
- else if (excelTable[1].Columns.Count != 10)
+ else if (excelTable[0].Columns.Count != 9)
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -42,85 +36,55 @@
else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
{
code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
- return Message;
- }
- else if (excelTable[0].Columns[1].ColumnName != "鐝粍缂栧彿(鍞竴)")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐝粍缂栧彿(鍞竴)}";
- return Message;
- }
- else if (excelTable[0].Columns[2].ColumnName != "鐝粍鍚嶇О")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鐝粍鍚嶇О}";
- return Message;
- }
- else if (excelTable[0].Columns[3].ColumnName != "鐝粍鎻忚堪")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鐝粍鎻忚堪}";
- return Message;
- }
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
- {
- code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "鐢ㄦ埛缂栧彿(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "鐢ㄦ埛缂栧彿(鍞竴)")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐢ㄦ埛缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "鐢ㄦ埛濮撳悕")
+ else if (excelTable[0].Columns[2].ColumnName != "鐢ㄦ埛濮撳悕")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鐢ㄦ埛濮撳悕}";
return Message;
}
- else if (excelTable[1].Columns[3].ColumnName != "鍦ㄨ亴鐘舵��")
+ else if (excelTable[0].Columns[3].ColumnName != "鍦ㄨ亴鐘舵��")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鍦ㄨ亴鐘舵�亇";
return Message;
}
- else if (excelTable[1].Columns[4].ColumnName != "瀵嗙爜")
+ else if (excelTable[0].Columns[4].ColumnName != "瀵嗙爜")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕瀵嗙爜}";
return Message;
}
- else if (excelTable[1].Columns[5].ColumnName != "鎵嬫満鍙�")
+ else if (excelTable[0].Columns[5].ColumnName != "鎵嬫満鍙�")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鎵嬫満鍙穧";
return Message;
}
- else if (excelTable[1].Columns[6].ColumnName != "閭")
+ else if (excelTable[0].Columns[6].ColumnName != "閭")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕閭}";
return Message;
}
- else if (excelTable[1].Columns[7].ColumnName != "缁勭粐缂栫爜")
+ else if (excelTable[0].Columns[7].ColumnName != "缁勭粐缂栫爜")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕缁勭粐缂栫爜}";
return Message;
}
- else if (excelTable[1].Columns[8].ColumnName != "宸ヨ祫绫诲瀷")
+ else if (excelTable[0].Columns[8].ColumnName != "宸ヨ祫绫诲瀷")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�9鍒楀簲涓簕宸ヨ祫绫诲瀷}";
- return Message;
- }
- else if (excelTable[1].Columns[9].ColumnName != "鐢ㄦ埛缁勭紪鐮�")
- {
- code = "300";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�10鍒楀簲涓簕鐢ㄦ埛缁勭紪鐮亇";
return Message;
}
else
@@ -146,13 +110,13 @@
return Message;
}
- else if (excelTable[0].Columns.Count != 3)
+ else if (excelTable[0].Columns.Count != 4)
{
code = "300";
Message = "瑙掕壊绫诲瀷妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
return Message;
}
- else if (excelTable[1].Columns.Count != 5)
+ else if (excelTable[1].Columns.Count != 6)
{
code = "300";
Message = "妯℃澘瑙掕壊娓呭崟涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -164,13 +128,19 @@
Message = "瑙掕壊绫诲瀷妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "瑙掕壊绫诲瀷缂栧彿(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "缁勭粐缂栫爜")
+ {
+ code = "300";
+ Message = "瑙掕壊绫诲瀷妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕缁勭粐缂栫爜}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[2].ColumnName != "瑙掕壊绫诲瀷缂栧彿(鍞竴)")
{
code = "300";
Message = "瑙掕壊绫诲瀷妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕瑙掕壊绫诲瀷缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[0].Columns[2].ColumnName != "瑙掕壊绫诲瀷鍚嶇О")
+ else if (excelTable[0].Columns[3].ColumnName != "瑙掕壊绫诲瀷鍚嶇О")
{
code = "300";
Message = "瑙掕壊绫诲瀷妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑙掕壊绫诲瀷鍚嶇О}";
@@ -182,25 +152,31 @@
Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "瑙掕壊缂栧彿(鍞竴)")
+ else if (excelTable[1].Columns[1].ColumnName != "缁勭粐缂栫爜")
+ {
+ code = "300";
+ Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕缁勭粐缂栫爜}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[2].ColumnName != "瑙掕壊缂栧彿(鍞竴)")
{
code = "300";
Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕瑙掕壊缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "瑙掕壊濮撳悕")
+ else if (excelTable[1].Columns[3].ColumnName != "瑙掕壊濮撳悕")
{
code = "300";
Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑙掕壊濮撳悕}";
return Message;
}
- else if (excelTable[1].Columns[3].ColumnName != "瑙掕壊绫诲瀷缂栫爜")
+ else if (excelTable[1].Columns[4].ColumnName != "瑙掕壊绫诲瀷缂栫爜")
{
code = "300";
Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕瑙掕壊绫诲瀷缂栫爜}";
return Message;
}
- else if (excelTable[1].Columns[4].ColumnName != "瑙掕壊鎻忚堪")
+ else if (excelTable[1].Columns[5].ColumnName != "瑙掕壊鎻忚堪")
{
code = "300";
Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕瑙掕壊鎻忚堪}";
@@ -569,23 +545,13 @@
string Message = "";
code = "";
List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToThreeTableList(FileCode);
- if (excelTable.Count != 6)
+ excelTable = ImportExcel.ExcelToTableList(FileCode);
+ if (excelTable.Count != 2)
{
code = "300";
Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
}
- else if (excelTable[0].Columns.Count != 4)
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
- }
- else if (excelTable[1].Columns.Count != 5)
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧缁�)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
- }
- else if (excelTable[2].Columns.Count != 9)
+ else if (excelTable[0].Columns.Count != 7)
{
code = "300";
Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -593,89 +559,34 @@
else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
{
code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
- }
- else if (excelTable[0].Columns[1].ColumnName != "璁惧绫诲瀷缂栧彿(鍞竴)")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧绫诲瀷缂栧彿(鍞竴)}";
- }
- else if (excelTable[0].Columns[2].ColumnName != "璁惧绫诲瀷鍚嶇О")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧绫诲瀷鍚嶇О}";
- }
- else if (excelTable[0].Columns[3].ColumnName != "璁惧绫诲瀷鎻忚堪")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕璁惧绫诲瀷鎻忚堪}";
- }
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
- }
- else if (excelTable[1].Columns[1].ColumnName != "璁惧缁勭紪鍙�(鍞竴)")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧缁勭紪鍙�(鍞竴)}";
- }
- else if (excelTable[1].Columns[2].ColumnName != "璁惧缁勫悕绉�")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧缁勫悕绉皚";
- }
- else if (excelTable[1].Columns[3].ColumnName != "璁惧绫诲瀷缂栧彿")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕璁惧绫诲瀷缂栧彿}";
- }
- else if (excelTable[1].Columns[4].ColumnName != "璁惧缁勬弿杩�")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕璁惧缁勬弿杩皚";
- }
- else if (excelTable[2].Columns[0].ColumnName != "搴忓彿")
- {
- code = "300";
Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
}
- else if (excelTable[2].Columns[1].ColumnName != "璁惧缂栧彿(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "璁惧缂栧彿(鍞竴)")
{
code = "300";
Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕璁惧缂栧彿(鍞竴)}";
}
- else if (excelTable[2].Columns[2].ColumnName != "璁惧鍚嶇О")
+ else if (excelTable[0].Columns[2].ColumnName != "璁惧鍚嶇О")
{
code = "300";
Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕璁惧鍚嶇О}";
}
- else if (excelTable[2].Columns[3].ColumnName != "璁惧绫诲瀷缂栧彿")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕璁惧绫诲瀷缂栧彿}";
- }
- else if (excelTable[2].Columns[4].ColumnName != "璁惧缁勭紪鍙�")
- {
- code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕璁惧缁勭紪鍙穧";
- }
- else if (excelTable[2].Columns[5].ColumnName != "鎶曞叆鏃ユ湡")
+ else if (excelTable[0].Columns[3].ColumnName != "鎶曞叆鏃ユ湡")
{
code = "300";
Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕鎶曞叆鏃ユ湡}";
}
- else if (excelTable[2].Columns[6].ColumnName != "鐢熶骇杞﹂棿")
+ else if (excelTable[0].Columns[4].ColumnName != "杞﹂棿缂栫爜")
{
code = "300";
- Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕鐢熶骇杞﹂棿}";
+ Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕杞﹂棿缂栫爜}";
}
- else if (excelTable[2].Columns[7].ColumnName != "浣跨敤鐘舵��")
+ else if (excelTable[0].Columns[5].ColumnName != "浣跨敤鐘舵��")
{
code = "300";
Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕浣跨敤鐘舵�亇";
}
- else if (excelTable[2].Columns[8].ColumnName != "绋煎姩鐜囷紙%锛�")
+ else if (excelTable[0].Columns[6].ColumnName != "绋煎姩鐜囷紙%锛�")
{
code = "300";
Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕绋煎姩鐜囷紙%锛墋";
@@ -1911,74 +1822,39 @@
var dynamicParams = new DynamicParameters();
DataTable dt;
List<ExcelErro> list = new List<ExcelErro>();
- List<DataTable> excelTable = new List<DataTable>();
- list = ImportExcel.ExcelToTableListErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
- excelTable = ImportExcel.ExcelToTableList(FileCode); //鑾峰彇Excel鏁版嵁
- //涓昏〃
- for (int j = 0; j < excelTable[0].Rows.Count; j++)
+ DataTable excelTable = new DataTable();
+ list = ImportExcel.ExcelToTableErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTable(FileCode); //鑾峰彇Excel鏁版嵁
+ for (int k = 0; k < excelTable.Rows.Count; k++)
{
- if (excelTable[0].Rows[j][1].ToString().Trim() != null && excelTable[0].Rows[j][1].ToString().Trim() != "")
- {
- sql = @"select * from TGroup where group_code=@group_code";
- dynamicParams.Add("@group_code", excelTable[0].Rows[j][1].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() + "宸插瓨鍦�";
- list.Add(erro);
- }
- }
- }
- //瀛愯〃
- for (int k = 0; k < excelTable[1].Rows.Count; k++)
- {
- if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
+ if (excelTable.Rows[k][1].ToString().Trim() != null && excelTable.Rows[k][1].ToString().Trim() != "")
{
sql = @"select * from TUser where usercode=@usercode";
- dynamicParams.Add("@usercode", excelTable[1].Rows[k][1].ToString().Trim());
+ dynamicParams.Add("@usercode", excelTable.Rows[k][1].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.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable.Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
- if (excelTable[1].Rows[k][7].ToString().Trim() != null && excelTable[1].Rows[k][7].ToString().Trim() != "")
+ if (excelTable.Rows[k][7].ToString().Trim() != null && excelTable.Rows[k][7].ToString().Trim() != "")
{
sql = @"select * from TOrganization where org_code=@org_code";
- dynamicParams.Add("@org_code", excelTable[1].Rows[k][7].ToString().Trim());
+ dynamicParams.Add("@org_code", excelTable.Rows[k][7].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt == null || dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{缁勭粐缂栫爜}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable.Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
- }
- //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
- var dt3 = from r in excelTable[1].AsEnumerable()
- where !(
- from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("鐝粍缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("鐢ㄦ埛缁勭紪鐮�"))
- select r;
- List<DataRow> listRow = dt3.ToList();
- if (listRow.Count > 0)
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{鐢ㄦ埛缁勭紪鐮亇";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缁勭紪鐮亇瀛楁涓湁鍊煎湪鐝粍琛�:{鐝粍缂栧彿(鍞竴)}涓笉瀛樺湪";
- list.Add(erro);
}
if (list.Count > 0)
{
@@ -1995,7 +1871,7 @@
{
StuCode = "200";
message = "鏁版嵁楠岃瘉鎴愬姛";
- count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+ count = excelTable.Rows.Count;
}
return list;
}
@@ -2017,17 +1893,31 @@
//涓昏〃
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[1].Rows[j][1].ToString().Trim() != null && excelTable[1].Rows[j][1].ToString().Trim() != "")
+ {
+ sql = @"select * from TOrganization where org_code=@org_code";
+ dynamicParams.Add("@org_code", excelTable[1].Rows[j][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt == null || dt.Rows.Count <= 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{缁勭粐缂栫爜}";
+ erro.ErrorCont = "瑙掕壊绫诲瀷琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[j][1].ToString().Trim() + "涓嶅瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ if (excelTable[0].Rows[j][2].ToString().Trim() != null && excelTable[0].Rows[j][2].ToString().Trim() != "")
{
sql = @"select * from TRoleType where roletype_code=@roletype_code";
- dynamicParams.Add("@roletype_code", excelTable[0].Rows[j][1].ToString().Trim());
+ dynamicParams.Add("@roletype_code", excelTable[0].Rows[j][2].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][2].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
@@ -2035,10 +1925,10 @@
//瀛愯〃
for (int k = 0; k < excelTable[1].Rows.Count; k++)
{
- if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
+ if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
{
sql = @"select * from TRole where role_code=@role_code";
- dynamicParams.Add("@role_code", excelTable[1].Rows[k][1].ToString().Trim());
+ dynamicParams.Add("@role_code", excelTable[1].Rows[k][2].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
@@ -2049,6 +1939,53 @@
list.Add(erro);
}
}
+ if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
+ {
+ sql = @"select * from TOrganization where org_code=@org_code";
+ dynamicParams.Add("@org_code", excelTable[1].Rows[k][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt == null || dt.Rows.Count <= 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{缁勭粐缂栫爜}";
+ erro.ErrorCont = "瑙掕壊琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[k][1].ToString().Trim() + "涓嶅瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ if (excelTable[1].Rows[k][4].ToString().Trim() != null && excelTable[1].Rows[k][4].ToString().Trim() != "")
+ {
+ sql = @"select torg_code from TRoleType where roletype_code=@roletype_code";
+ dynamicParams.Add("@roletype_code", excelTable[1].Rows[k][4].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ if (dt.Rows[0]["torg_code"].ToString() != excelTable[1].Rows[k][1].ToString().Trim())
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{瑙掕壊绫诲瀷缂栫爜}";
+ erro.ErrorCont = "瑙掕壊琛�:{瑙掕壊绫诲瀷缂栫爜}瀛楁" + excelTable[1].Rows[k][4].ToString().Trim() + " 涓嶆槸缁勭粐缂栫爜:" + excelTable[1].Rows[k][1].ToString().Trim() + "涓嬬殑瑙掕壊缁�";
+ list.Add(erro);
+ }
+ }
+ }
+ }
+ //鍒ゆ柇瀛愯〃缁勭粐缂栫爜涓嶅瓨鍦ㄤ簬涓昏〃缁勭粐缂栫爜涓殑鏁版嵁
+ var dt2 = from r in excelTable[1].AsEnumerable()
+ where !(
+ from rr in excelTable[0].AsEnumerable()
+ select rr.Field<string>("缁勭粐缂栫爜")
+ ).Contains(r.Field<string>("缁勭粐缂栫爜"))
+ select r;
+ List<DataRow> listRow2 = dt2.ToList();
+ if (listRow2.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{缁勭粐缂栫爜}";
+ erro.ErrorCont = "瑙掕壊琛�:{缁勭粐缂栫爜}瀛楁涓湁鍊煎湪瑙掕壊绫诲瀷琛�:{缁勭粐缂栫爜}涓笉瀛樺湪";
+ list.Add(erro);
}
//鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
var dt3 = from r in excelTable[1].AsEnumerable()
@@ -2277,103 +2214,41 @@
var dynamicParams = new DynamicParameters();
DataTable dt;
List<ExcelErro> list = new List<ExcelErro>();
- List<DataTable> excelTable = new List<DataTable>();
- list = ImportExcel.ExcelToThreeTableListErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
- excelTable = ImportExcel.ExcelToThreeTableList(FileCode); //鑾峰彇Excel鏁版嵁
- //璁惧绫诲瀷琛�,鍒ゆ柇璁惧绫诲瀷鏄惁瀛樺湪
- for (int i = 0; i < excelTable[0].Rows.Count; i++)
- {
- if (excelTable[0].Rows[i][1].ToString().Trim() != null && excelTable[0].Rows[i][1].ToString().Trim() != "")
- {
- sql = @"select * from TEqpType where code=@code";
- dynamicParams.Add("@code", excelTable[0].Rows[i][1].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[i][1].ToString().Trim() + "宸插瓨鍦�";
- list.Add(erro);
- }
- }
- }
- //璁惧缁勮〃,鍒ゆ柇璁惧缁勬槸鍚﹀瓨鍦�
- for (int j = 0; j < excelTable[1].Rows.Count; j++)
- {
- if (excelTable[1].Rows[j][1].ToString().Trim() != null && excelTable[1].Rows[j][1].ToString().Trim() != "")
- {
- sql = @"select * from TEqpGroup where code=@code";
- dynamicParams.Add("@code", excelTable[1].Rows[j][1].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[j][1].ToString().Trim() + "宸插瓨鍦�";
- list.Add(erro);
- }
- }
- }
- //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
- var dt3 = from r in excelTable[1].AsEnumerable()
- where !(
- from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("璁惧绫诲瀷缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("璁惧绫诲瀷缂栧彿"))
- select r;
- List<DataRow> listRow = dt3.ToList();
- if (listRow.Count > 0)
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{璁惧绫诲瀷缂栧彿}";
- erro.ErrorCont = "璁惧缁勪俊鎭�:{璁惧绫诲瀷缂栧彿}瀛楁涓湁鍊煎湪璁惧绫诲瀷淇℃伅:{璁惧绫诲瀷缂栧彿(鍞竴)}涓笉瀛樺湪";
- list.Add(erro);
- }
+ DataTable excelTable = new DataTable();
+ list = ImportExcel.ExcelToTableErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTable(FileCode); //鑾峰彇Excel鏁版嵁
//璁惧娓呭崟琛�
- for (int k = 0; k < excelTable[2].Rows.Count; k++)
+ for (int k = 0; k < excelTable.Rows.Count; k++)
{
- if (excelTable[2].Rows[k][1].ToString().Trim() != null && excelTable[2].Rows[k][1].ToString().Trim() != "")
+ if (excelTable.Rows[k][1].ToString().Trim() != null && excelTable.Rows[k][1].ToString().Trim() != "")
{
sql = @"select * from TEqpInfo where code=@code";
- dynamicParams.Add("@code", excelTable[2].Rows[k][1].ToString().Trim());
+ dynamicParams.Add("@code", excelTable.Rows[k][1].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{璁惧缂栧彿(鍞竴)}";
- erro.ErrorCont = "璁惧琛�:{璁惧缂栧彿(鍞竴)}瀛楁" + excelTable[2].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
- list.Add(erro);
- }
- //鍒ゆ柇璁惧缁勬槸鍚﹀搴旀纭殑璁惧绫诲瀷
- var yourGetData = excelTable[1].AsEnumerable().Where<DataRow>(a => a["璁惧绫诲瀷缂栧彿"].ToString() == excelTable[2].Rows[k][3].ToString().Trim()&& a["璁惧缁勭紪鍙�(鍞竴)"].ToString() == excelTable[2].Rows[k][4].ToString().Trim());
- if (yourGetData.Count() <= 0)
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{璁惧绫诲瀷缂栧彿}/{璁惧缁勭紪鍙穧";
- erro.ErrorCont = "璁惧琛�:{璁惧缂栧彿(鍞竴)}瀛楁" + excelTable[2].Rows[k][1].ToString().Trim() + "瀵瑰簲{璁惧绫诲瀷缂栧彿}:"+ excelTable[2].Rows[k][4].ToString().Trim() + "/{璁惧缁勭紪鍙穧:"+ excelTable[2].Rows[k][4].ToString().Trim() + "涓庤澶囩粍娓呭崟涓缃涓嶄笂";
+ erro.ErrorCont = "璁惧琛�:{璁惧缂栧彿(鍞竴)}瀛楁" + excelTable.Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
}
//杞﹂棿鍒ゆ柇
- for (int m = 0; m < excelTable[2].Rows.Count; m++)
+ for (int m = 0; m < excelTable.Rows.Count; m++)
{
- if (excelTable[2].Rows[m][6].ToString().Trim() != null && excelTable[2].Rows[m][6].ToString().Trim() != "")
+ if (excelTable.Rows[m][4].ToString().Trim() != null && excelTable.Rows[m][4].ToString().Trim() != "")
{
- sql = @"select * from TOrganization where org_name=@code and description='W'";
- dynamicParams.Add("@code", excelTable[2].Rows[m][6].ToString().Trim());
+ sql = @"select * from TOrganization where org_code=@code and description='W'";
+ dynamicParams.Add("@code", excelTable.Rows[m][4].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count<=0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
- erro.ErrorField = "{鐢熶骇杞﹂棿}";
- erro.ErrorCont = "璁惧琛�:{鐢熶骇杞﹂棿}瀛楁" + excelTable[2].Rows[m][6].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorField = "{杞﹂棿缂栫爜}";
+ erro.ErrorCont = "璁惧琛�:{杞﹂棿缂栫爜}瀛楁" + excelTable.Rows[m][4].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
@@ -2393,7 +2268,7 @@
{
StuCode = "200";
message = "鏁版嵁楠岃瘉鎴愬姛";
- count = excelTable[0].Rows.Count + excelTable[1].Rows.Count+excelTable[2].Rows.Count;
+ count = excelTable.Rows.Count;
}
return list;
}
@@ -2502,19 +2377,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 +2559,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 +2570,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 +3045,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);
}
}
@@ -3230,30 +3124,12 @@
try
{
list.Clear();
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToTableList(FileCode);
- //瀵煎叆鐝粍
- for (int k = 0; k < excelTable[0].Rows.Count; k++)
- {
- sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date)
- values(@group_code,@group_name,@description,@Operator,@CreateDate)";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- group_code = excelTable[0].Rows[k][1].ToString().Trim(),
- group_name = excelTable[0].Rows[k][2].ToString().Trim(),
- description = excelTable[0].Rows[k][3].ToString().Trim(),
- CreateDate = DateTime.Now.ToString(),
- Operator = User
- }
- });
- }
+ DataTable excelTable = new DataTable();
+ excelTable = ImportExcel.ExcelToTable(FileCode);
//瀵煎叆鐢ㄦ埛
- for (int i = 0; i < excelTable[1].Rows.Count; i++)
+ for (int i = 0; i < excelTable.Rows.Count; i++)
{
- if (excelTable[1].Rows[i][3].ToString().Trim() == "鍦ㄨ亴")
+ if (excelTable.Rows[i][3].ToString().Trim() == "鍦ㄨ亴")
{
Enable = "Y";
}
@@ -3262,7 +3138,7 @@
Enable = "N";
}
//宸ヨ祫绫诲瀷
- switch (excelTable[1].Rows[i][8].ToString().Trim())
+ switch (excelTable.Rows[i][8].ToString().Trim())
{
case "璁′欢鍒�":
WageType = "2";
@@ -3273,24 +3149,31 @@
default:
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 = @"select * from TUser where usercode=@usercode";
+ dynamicParams.Add("@usercode", excelTable.Rows[i][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ continue;
+ }
+ 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,
parm = new
{
- UserCode = excelTable[1].Rows[i][1].ToString().Trim(),
- UserName = excelTable[1].Rows[i][2].ToString().Trim(),
- password = excelTable[1].Rows[i][4].ToString().Trim(),
+ UserCode = excelTable.Rows[i][1].ToString().Trim(),
+ UserName = excelTable.Rows[i][2].ToString().Trim(),
+ password = excelTable.Rows[i][4].ToString().Trim(),
Enable = Enable,
- Mobile = excelTable[1].Rows[i][5].ToString().Trim(),
+ Mobile = excelTable.Rows[i][5].ToString().Trim(),
CreateDate = DateTime.Now.ToString(),
- Email = excelTable[1].Rows[i][6].ToString().Trim(),
+ Email = excelTable.Rows[i][6].ToString().Trim(),
Operator = User,
- StuOrg = excelTable[1].Rows[i][7].ToString().Trim(),
- wagetype = WageType
+ StuOrg = excelTable.Rows[i][7].ToString().Trim(),
+ wagetype = WageType,
+ usergroup_code = excelTable.Rows[i][9].ToString().Trim()
}
});
}
@@ -3333,34 +3216,36 @@
//瀵煎叆瑙掕壊绫诲瀷
for (int k = 0; k < excelTable[0].Rows.Count; k++)
{
- sql = @"insert into TRoleType(roletype_code,roletype_name)
- values(@roletype_code,@roletype_name)";
+ sql = @"insert into TRoleType(roletype_code,roletype_name,torg_code)
+ values(@roletype_code,@roletype_name,@torg_code)";
list.Add(new
{
str = sql,
parm = new
{
- roletype_code = excelTable[0].Rows[k][1].ToString().Trim(),
- roletype_name = excelTable[0].Rows[k][2].ToString().Trim()
+ roletype_code = excelTable[0].Rows[k][2].ToString().Trim(),
+ roletype_name = excelTable[0].Rows[k][3].ToString().Trim(),
+ torg_code = excelTable[0].Rows[k][1].ToString().Trim()
}
});
}
//瀵煎叆瑙掕壊
for (int i = 0; i < excelTable[1].Rows.Count; i++)
{
- sql = @"insert into TRole(role_code,role_name,roletype_code,description,lm_user,lm_date)
- values(@role_code,@role_name,@roletype_code,@description,@Operator,@CreateDate)";
+ sql = @"insert into TRole(role_code,role_name,roletype_code,description,lm_user,lm_date,torg_code)
+ values(@role_code,@role_name,@roletype_code,@description,@Operator,@CreateDate,@torg_code)";
list.Add(new
{
str = sql,
parm = new
{
- role_code = excelTable[1].Rows[i][1].ToString().Trim(),
- role_name = excelTable[1].Rows[i][2].ToString().Trim(),
- roletype_code = excelTable[1].Rows[i][3].ToString().Trim(),
- description = excelTable[1].Rows[i][4].ToString().Trim(),
+ role_code = excelTable[1].Rows[i][2].ToString().Trim(),
+ role_name = excelTable[1].Rows[i][3].ToString().Trim(),
+ roletype_code = excelTable[1].Rows[i][4].ToString().Trim(),
+ description = excelTable[1].Rows[i][5].ToString().Trim(),
Operator = User,
- CreateDate = DateTime.Now.ToString()
+ CreateDate = DateTime.Now.ToString(),
+ torg_code = excelTable[1].Rows[i][1].ToString().Trim()
}
});
}
@@ -3420,24 +3305,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 +3330,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()
}
});
}
@@ -3594,77 +3477,37 @@
try
{
list.Clear();
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToThreeTableList(FileCode);
- //鍐欏叆璁惧绫诲瀷
- for (int i = 0; i < excelTable[0].Rows.Count; i++)
- {
- sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark)
- values(@code,@name,@lm_user,@lm_date,@remark)";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = excelTable[0].Rows[i][1].ToString().Trim(),
- name = excelTable[0].Rows[i][2].ToString().Trim(),
- lm_user = User,
- lm_date = DateTime.Now.ToString(),
- remark= excelTable[0].Rows[i][3].ToString().Trim()
-
- }
- });
- }
- //鍐欏叆璁惧缁�
- for (int j = 0; j < excelTable[1].Rows.Count; j++)
- {
- sql = @"insert into TEqpGroup(code,name,lm_user,lm_date,remark,eqptype_code)
- values(@code,@name,@lm_user,@lm_date,@remark,@eqptype_code)";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = excelTable[1].Rows[j][1].ToString().Trim(),
- name = excelTable[1].Rows[j][2].ToString().Trim(),
- lm_user = User,
- lm_date = DateTime.Now.ToString(),
- remark = excelTable[1].Rows[j][4].ToString().Trim(),
- eqptype_code= excelTable[1].Rows[j][3].ToString().Trim()
-
- }
- });
- }
+ DataTable excelTable = new DataTable();
+ excelTable = ImportExcel.ExcelToTable(FileCode);
//瀵煎叆璁惧娓呭崟
- for (int k = 0; k < excelTable[2].Rows.Count; k++)
+ for (int k = 0; k < excelTable.Rows.Count; k++)
{
- //鑾峰彇杞﹂棿缂栫爜
- string sql0 = @"select org_code,org_name from TOrganization where org_name=@wkshp and description='W' and is_delete<>'1'";
- dynamicParams.Add("@wkshp", excelTable[2].Rows[k][6].ToString());
- var data = DapperHelper.selectdata(sql0, dynamicParams);
-
- sql = @"insert into TEqpInfo(code,name,eqptype_code,eqpgroup_code,wksp_code,input_date,operation_ration,enable,opc_uom,lm_user,lm_date)
- values(@devicecode,@devicename,@devicetype,@devicegroup,@workshop,@importdate,@ratio,@status,@uom,@lm_user,@lm_date)";
+ sql = @"select * from TEqpInfo where code=@eqp_code";
+ dynamicParams.Add("@eqp_code", excelTable.Rows[k][1].ToString().Trim());
+ DataTable dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ continue;
+ }
+ sql = @"insert into TEqpInfo(code,name,wksp_code,input_date,operation_ration,enable,opc_uom,lm_user,lm_date)
+ values(@devicecode,@devicename,@workshop,@importdate,@ratio,@status,@uom,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
parm = new
{
- devicecode = excelTable[2].Rows[k][1].ToString().Trim(),
- devicename = excelTable[2].Rows[k][2].ToString().Trim(),
- devicetype = excelTable[2].Rows[k][3].ToString().Trim(),
- devicegroup = excelTable[2].Rows[k][4].ToString().Trim(),
- workshop = data.Rows[0]["org_code"].ToString().Trim(),
- importdate = excelTable[2].Rows[k][5].ToString().Trim(),
- ratio = excelTable[2].Rows[k][8].ToString().Trim(),
- status = excelTable[2].Rows[k][7].ToString().Trim(),
+ devicecode = excelTable.Rows[k][1].ToString().Trim(),
+ devicename = excelTable.Rows[k][2].ToString().Trim(),
+ workshop = excelTable.Rows[k][4].ToString().Trim(),
+ importdate = excelTable.Rows[k][3].ToString().Trim(),
+ ratio = excelTable.Rows[k][6].ToString().Trim(),
+ status = excelTable.Rows[k][5].ToString().Trim(),
uom = "鍙�",
lm_user = User,
lm_date = DateTime.Now.ToString()
}
});
}
-
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -3816,7 +3659,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 +3736,7 @@
// default:
// break;
//}
- switch (excelTable.Rows[i][4].ToString().Trim())
+ switch (excelTable.Rows[i][3].ToString().Trim())
{
case "鏄�":
IsScan = "Y";
--
Gitblit v1.9.3