From 8cdeacd407027fdffa13b86c089c6ab407f3b773 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 十二月 2023 17:57:06 +0800
Subject: [PATCH] 1.设备保养项目、设备保养标准导入接口开发

---
 VueWebCoreApi/Tools/ImportExcelData.cs | 2146 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 1,457 insertions(+), 689 deletions(-)

diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 688d743..347c6a7 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -227,7 +227,7 @@
                 return Message;
 
             }
-            else if (excelTable[0].Columns.Count != 6)
+            else if (excelTable[0].Columns.Count != 4)
             {
                 code = "301";
                 Message = "瑙掕壊娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -251,22 +251,10 @@
                 Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鐘舵�亇";
                 return Message;
             }
-            else if (excelTable[0].Columns[3].ColumnName != "鏁版嵁鑼冨洿")
+            else if (excelTable[0].Columns[3].ColumnName != "鎻忚堪")
             {
                 code = "301";
-                Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鏁版嵁鑼冨洿}";
-                return Message;
-            }
-            else if (excelTable[0].Columns[4].ColumnName != "鏁版嵁鏉冮檺")
-            {
-                code = "301";
-                Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鏁版嵁鏉冮檺}";
-                return Message;
-            }
-            else if (excelTable[0].Columns[5].ColumnName != "鎻忚堪")
-            {
-                code = "301";
-                Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鎻忚堪}";
+                Message = "瑙掕壊娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鎻忚堪}";
                 return Message;
             }
             else
@@ -464,10 +452,10 @@
                 Message = "搴撲綅璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鎵�灞炰粨搴撶紪鐮亇";
                 return Message;
             }
-            else if (excelTable[0].Columns[3].ColumnName != "*涓婄骇搴撲綅缂栫爜")
+            else if (excelTable[0].Columns[3].ColumnName != "涓婄骇搴撲綅缂栫爜")
             {
                 code = "301";
-                Message = "搴撲綅璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*涓婄骇搴撲綅缂栫爜}";
+                Message = "搴撲綅璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕涓婄骇搴撲綅缂栫爜}";
                 return Message;
             }
             else if (excelTable[0].Columns[4].ColumnName != "*鐘舵��")
@@ -509,7 +497,7 @@
                 Message = "瀛樿揣鍒嗙被妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
                 return Message;
             }
-            else if (excelTable[1].Columns.Count != 12)
+            else if (excelTable[1].Columns.Count != 13)
             {
                 code = "301";
                 Message = "瀛樿揣妗f妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -521,10 +509,10 @@
                 Message = "瀛樿揣鍒嗙被鍨嬫ā鏉匡細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕*瀛樿揣鍒嗙被缂栧彿(鍞竴)}";
                 return Message;
             }
-            else if (excelTable[0].Columns[1].ColumnName != "*瀛樿揣鍒嗙被鍨嬪悕绉�")
+            else if (excelTable[0].Columns[1].ColumnName != "*瀛樿揣鍒嗙被鍚嶇О")
             {
                 code = "301";
-                Message = "瀛樿揣鍒嗙被鍨嬫ā鏉匡細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕*瀛樿揣鍒嗙被鍨嬪悕绉皚";
+                Message = "瀛樿揣鍒嗙被鍨嬫ā鏉匡細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕*瀛樿揣鍒嗙被鍚嶇О}";
                 return Message;
             }
             else if (excelTable[0].Columns[2].ColumnName != "涓婄骇缂栫爜")
@@ -569,10 +557,10 @@
                 Message = "瀛樿揣妗f妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕*璁¢噺鏂瑰紡}";
                 return Message;
             }
-            else if (excelTable[1].Columns[6].ColumnName != "*璁¢噺鍗曚綅/缁勭紪鐮�")
+            else if (excelTable[1].Columns[6].ColumnName != "*璁¢噺鍗曚綅/缁勫悕绉�")
             {
                 code = "301";
-                Message = "瀛樿揣妗f妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕*璁¢噺鍗曚綅/缁勭紪鐮亇";
+                Message = "瀛樿揣妗f妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕*璁¢噺鍗曚綅/缁勫悕绉皚";
                 return Message;
             }
             else if (excelTable[1].Columns[7].ColumnName != "鎵�灞炰粨搴撶紪鐮�")
@@ -638,7 +626,7 @@
                 Message = "璁惧绫诲瀷妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
                 return Message;
             }
-            else if (excelTable[1].Columns.Count != 6)
+            else if (excelTable[1].Columns.Count != 5)
             {
                 code = "301";
                 Message = "璁惧娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -674,7 +662,7 @@
                 Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*璁惧鍚嶇О}";
                 return Message;
             }
-            else if (excelTable[1].Columns[2].ColumnName != "鎵�灞炵粍缁囩紪鐮�")
+            else if (excelTable[1].Columns[2].ColumnName != "*鎵�灞炵粍缁囩紪鐮�")
             {
                 code = "301";
                 Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鎵�灞炵粍缁囩紪鐮亇";
@@ -686,16 +674,10 @@
                 Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*璁惧绫诲瀷缂栫爜}";
                 return Message;
             }
-            else if (excelTable[1].Columns[4].ColumnName != "*鍚敤鏃ユ湡")
+            else if (excelTable[1].Columns[4].ColumnName != "*鐘舵��")
             {
                 code = "301";
-                Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*鍚敤鏃ユ湡}";
-                return Message;
-            }
-            else if (excelTable[1].Columns[5].ColumnName != "*鐘舵��")
-            {
-                code = "301";
-                Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕*鐘舵�亇";
+                Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*鐘舵�亇";
                 return Message;
             }
             else
@@ -708,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
@@ -773,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
@@ -886,12 +846,10 @@
         #endregion
 
         #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧淇濆吇椤圭洰妯℃澘銆�
-        public static string Eleven(string FileCode, out string code)
+        public static string Eleven(List<DataTable> excelTable, out string code)
         {
             string Message = "";
             code = "";
-            List<DataTable> excelTable = new List<DataTable>();
-            excelTable = ImportExcel.ExcelToTableList(FileCode);
             if (excelTable.Count != 2)
             {
                 code = "300";
@@ -899,37 +857,31 @@
                 return Message;
 
             }
-            else if (excelTable[0].Columns.Count != 5)
+            else if (excelTable[0].Columns.Count != 4)
             {
                 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 != "鏄惁鎵爜")
-            {
-                code = "300";
-                Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
-                return Message;
-            }
-            else if (excelTable[0].Columns[4].ColumnName != "淇濆吇椤圭洰瑕佹眰")
+            else if (excelTable[0].Columns[3].ColumnName != "淇濆吇椤圭洰瑕佹眰")
             {
                 code = "300";
                 Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕淇濆吇椤圭洰瑕佹眰}";
@@ -945,101 +897,87 @@
         #endregion
 
         #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧淇濆吇鏍囧噯妯℃澘銆�
-        public static string TwentyThree(string FileCode, out string code)
+        public static string Eleven_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 != 7)
+            else if (excelTable[1].Columns.Count != 6)
             {
                 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鍒楀簲涓簕璁惧淇濆吇閮ㄤ綅鍚嶇О}";
-                return Message;
-            }
-            else if (excelTable[1].Columns[5].ColumnName != "淇濆吇閮ㄤ綅瑕佹眰")
-            {
-                code = "300";
-                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕淇濆吇閮ㄤ綅瑕佹眰}";
-                return Message;
-            }
-            else if (excelTable[1].Columns[6].ColumnName != "閫夋嫨鎵爜")
-            {
-                code = "300";
-                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕閫夋嫨鎵爜}";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕*閫夋嫨鎵爜}";
                 return Message;
             }
             else
@@ -1051,138 +989,122 @@
         }
         #endregion
 
-        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,宸ヨ娓呭崟妯℃澘銆�
-        public static string Twelve(string FileCode, out string code)
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿娓呭崟妯℃澘銆�
+        public static string Twelve(List<DataTable> excelTable, out string code)
         {
             string Message = "";
             code = "";
-            DataTable excelTable = new DataTable();
-            excelTable = ImportExcel.ExcelToTable(FileCode);
-            if (excelTable.Columns.Count != 7)
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable.Columns[0].ColumnName != "搴忓彿")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable.Columns[1].ColumnName != "宸ヨ缂栧彿(鍞竴)")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable.Columns[2].ColumnName != "宸ヨ鍚嶇О锛堝敮涓�锛�")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable.Columns[3].ColumnName != "宸ヨ绫诲瀷")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable.Columns[4].ColumnName != "鍨嬭厰鏁伴噺")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable.Columns[5].ColumnName != "鐞嗚瀵垮懡锛堟锛�")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable.Columns[6].ColumnName != "浣跨敤鐘舵��")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else
-            {
-                code = "200";
-                Message = "妯℃澘妫�楠岄�氳繃";
-            }
-            return Message;
-        }
-        #endregion
-
-        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,宸ヨ鐐规妯℃澘銆�
-        public static string Thirteen(string FileCode, out string code)
-        {
-            string Message = "";
-            code = "";
-            List<DataTable> excelTable = new List<DataTable>();
-            excelTable = ImportExcel.ExcelToTableList(FileCode);
             if (excelTable.Count != 2)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+                code = "301";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
+            }
+            else if (excelTable[0].Columns.Count != 6)
+            {
+                code = "301";
+                Message = "妯″叿娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[1].Columns.Count != 2)
+            {
+                code = "301";
+                Message = "妯″叿鍏宠仈浜у搧妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[0].Columns[0].ColumnName != "*妯″叿缂栧彿(鍞竴)")
+            {
+                code = "301";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿缂栧彿(鍞竴)}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[1].ColumnName != "*妯″叿鍚嶇О")
+            {
+                code = "301";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*妯″叿鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[2].ColumnName != "瑙勬牸鍨嬪彿")
+            {
+                code = "301";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑙勬牸鍨嬪彿}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[3].ColumnName != "*鐘舵��")
+            {
+                code = "301";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*鐘舵�亇";
+                return Message;
+            }
+            else if (excelTable[0].Columns[4].ColumnName != "棰勮瀵垮懡(娆�)")
+            {
+                code = "301";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[5].ColumnName != "鍓╀綑瀵垮懡(娆�)")
+            {
+                code = "301";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[0].ColumnName != "妯″叿缂栫爜")
+            {
+                code = "301";
+                Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕妯″叿缂栫爜}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[1].ColumnName != "浜у搧缂栫爜")
+            {
+                code = "301";
+                Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕浜у搧缂栫爜}";
+                return Message;
+            }
+            else
+            {
+                code = "200";
+                Message = "妯℃澘妫�楠岄�氳繃";
+            }
+            return Message;
+        }
+        #endregion
+
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿鐐规椤规ā鏉裤��
+        public static string Thirteen(List<DataTable> excelTable, out string code)
+        {
+            string Message = "";
+            code = "";
+            if (excelTable.Count != 1)
+            {
+                code = "301";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
             }
             else if (excelTable[0].Columns.Count != 3)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                code = "301";
+                Message = "妯″叿鐐规椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
             }
-            else if (excelTable[1].Columns.Count != 8)
+            else if (excelTable[0].Columns[0].ColumnName != "*鐐规椤圭洰缂栧彿(鍞竴)")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                code = "301";
+                Message = "妯″叿鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*鐐规椤圭洰缂栧彿(鍞竴)}";
+                return Message;
             }
-            else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+            else if (excelTable[0].Columns[1].ColumnName != "*鐐规椤圭洰鍚嶇О")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "妯″叿鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*鐐规椤圭洰鍚嶇О}";
+                return Message;
             }
-            else if (excelTable[0].Columns[1].ColumnName != "鐐规鏍囧噯(鍞竴)")
+            else if (excelTable[0].Columns[2].ColumnName != "瑕佹眰鎻忚堪")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鍚嶇О锛堝敮涓�锛�")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[1].ColumnName != "鐐规鏍囧噯")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[2].ColumnName != "鏍囧噯鍚嶇О")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[3].ColumnName != "SEQ(閮ㄤ綅椤哄簭)")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[4].ColumnName != "閮ㄤ綅鏉$爜锛堝敮涓�锛�")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[5].ColumnName != "閮ㄤ綅鍚嶇О")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[6].ColumnName != "鐐规瑕佹眰")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[7].ColumnName != "鐐规鍛ㄦ湡")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "妯″叿鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑕佹眰鎻忚堪}";
+                return Message;
             }
             else
             {
@@ -1193,82 +1115,203 @@
         }
         #endregion
 
-        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,宸ヨ淇濆吇妯℃澘銆�
-        public static string Fourteen(string FileCode, out string code)
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿鐐规鏍囧噯妯℃澘銆�
+        public static string Thirteen_one(List<DataTable> excelTable, out string code)
         {
             string Message = "";
             code = "";
-            List<DataTable> excelTable = new List<DataTable>();
-            excelTable = ImportExcel.ExcelToTableList(FileCode);
             if (excelTable.Count != 2)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+                code = "301";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
             }
             else if (excelTable[0].Columns.Count != 3)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                code = "301";
+                Message = "妯″叿鐐规鏍囧噯妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
             }
-            else if (excelTable[1].Columns.Count != 8)
+            else if (excelTable[1].Columns.Count != 5)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                code = "301";
+                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
             }
-            else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+            else if (excelTable[0].Columns[0].ColumnName != "*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "妯″叿鐐规鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}";
+                return Message;
             }
-            else if (excelTable[0].Columns[1].ColumnName != "淇濆吇鏍囧噯(鍞竴)")
+            else if (excelTable[0].Columns[1].ColumnName != "*妯″叿鐐规鏍囧噯鍚嶇О")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "妯″叿鐐规鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*妯″叿鐐规鏍囧噯鍚嶇О}";
+                return Message;
             }
-            else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鍚嶇О锛堝敮涓�锛�")
+            else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鎻忚堪")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "妯″叿鐐规鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鏍囧噯鎻忚堪}";
+                return Message;
             }
-            else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
+            else if (excelTable[1].Columns[0].ColumnName != "*妯″叿鐐规鏍囧噯缂栧彿")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿鐐规鏍囧噯缂栧彿}";
+                return Message;
             }
-            else if (excelTable[1].Columns[1].ColumnName != "淇濆吇鏍囧噯")
+            else if (excelTable[1].Columns[1].ColumnName != "*鐐规椤瑰簭鍙�")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*鐐规椤瑰簭鍙穧";
+                return Message;
             }
-            else if (excelTable[1].Columns[2].ColumnName != "鏍囧噯鍚嶇О")
+            else if (excelTable[1].Columns[2].ColumnName != "*妯″叿鐐规椤圭紪鍙�(鍞竴)")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
+                return Message;
             }
-            else if (excelTable[1].Columns[3].ColumnName != "SEQ(閮ㄤ綅椤哄簭)")
+            else if (excelTable[1].Columns[3].ColumnName != "*妯″叿鐐规椤瑰悕绉�")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*妯″叿鐐规椤瑰悕绉皚";
+                return Message;
             }
-            else if (excelTable[1].Columns[4].ColumnName != "閮ㄤ綅鏉$爜锛堝敮涓�锛�")
+            else if (excelTable[1].Columns[4].ColumnName != "鐐规椤硅姹�")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鐐规椤硅姹倉";
+                return Message;
             }
-            else if (excelTable[1].Columns[5].ColumnName != "閮ㄤ綅鍚嶇О")
+            else
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "200";
+                Message = "妯℃澘妫�楠岄�氳繃";
             }
-            else if (excelTable[1].Columns[6].ColumnName != "淇濆吇瑕佹眰")
+            return Message;
+        }
+        #endregion
+
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿淇濆吇椤规ā鏉裤��
+        public static string Fourteen(List<DataTable> excelTable, out string code)
+        {
+            string Message = "";
+            code = "";
+            if (excelTable.Count != 1)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
             }
-            else if (excelTable[1].Columns[7].ColumnName != "淇濆吇绛夌骇")
+            else if (excelTable[0].Columns.Count != 3)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "妯″叿淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[0].Columns[0].ColumnName != "*淇濆吇椤圭洰缂栧彿(鍞竴)")
+            {
+                code = "301";
+                Message = "妯″叿淇濆吇椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*淇濆吇椤圭洰缂栧彿(鍞竴)}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[1].ColumnName != "*淇濆吇椤圭洰鍚嶇О")
+            {
+                code = "301";
+                Message = "妯″叿淇濆吇椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*淇濆吇椤圭洰鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[2].ColumnName != "瑕佹眰鎻忚堪")
+            {
+                code = "301";
+                Message = "妯″叿淇濆吇椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑕佹眰鎻忚堪}";
+                return Message;
+            }
+            else
+            {
+                code = "200";
+                Message = "妯℃澘妫�楠岄�氳繃";
+            }
+            return Message;
+        }
+        #endregion
+
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿淇濆吇鏍囧噯妯℃澘銆�
+        public static string Fourteen_one(List<DataTable> excelTable, out string code)
+        {
+            string Message = "";
+            code = "";
+            if (excelTable.Count != 2)
+            {
+                code = "301";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
+            }
+            else if (excelTable[0].Columns.Count != 3)
+            {
+                code = "301";
+                Message = "妯″叿淇濆吇鏍囧噯妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[1].Columns.Count != 5)
+            {
+                code = "301";
+                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[0].Columns[0].ColumnName != "*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)")
+            {
+                code = "301";
+                Message = "妯″叿淇濆吇鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[1].ColumnName != "*妯″叿淇濆吇鏍囧噯鍚嶇О")
+            {
+                code = "301";
+                Message = "妯″叿淇濆吇鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鎻忚堪")
+            {
+                code = "301";
+                Message = "妯″叿淇濆吇鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鏍囧噯鎻忚堪}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[0].ColumnName != "*妯″叿淇濆吇鏍囧噯缂栧彿")
+            {
+                code = "301";
+                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯缂栧彿}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[1].ColumnName != "*淇濆吇椤瑰簭鍙�")
+            {
+                code = "301";
+                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*淇濆吇椤瑰簭鍙穧";
+                return Message;
+            }
+            else if (excelTable[1].Columns[2].ColumnName != "*妯″叿淇濆吇椤圭紪鍙�(鍞竴)")
+            {
+                code = "301";
+                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[3].ColumnName != "*妯″叿淇濆吇椤瑰悕绉�")
+            {
+                code = "301";
+                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*妯″叿淇濆吇椤瑰悕绉皚";
+                return Message;
+            }
+            else if (excelTable[1].Columns[4].ColumnName != "淇濆吇椤硅姹�")
+            {
+                code = "301";
+                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕淇濆吇椤硅姹倉";
+                return Message;
             }
             else
             {
@@ -1280,36 +1323,52 @@
         #endregion
 
         #region銆怑xcel妯℃澘涓婁紶楠岃瘉,宸ュ簭瀹氫箟妯℃澘銆�
-        public static string Fifteen(string FileCode, out string code)
+        public static string Fifteen(List<DataTable> excelTable, out string code)
         {
             string Message = "";
             code = "";
-            DataTable excelTable = new DataTable();
-            excelTable = ImportExcel.ExcelToTable(FileCode);
-            if (excelTable.Columns.Count != 4)
+            if (excelTable.Count != 1)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
             }
-            else if (excelTable.Columns[0].ColumnName != "搴忓彿")
+            else if (excelTable[0].Columns.Count != 5)
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "宸ュ簭璁剧疆妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
             }
-            else if (excelTable.Columns[1].ColumnName != "宸ュ簭缂栫爜(鍞竴)")
+            else if (excelTable[0].Columns[0].ColumnName != "*宸ュ簭缂栧彿(鍞竴)")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*宸ュ簭缂栧彿(鍞竴)}";
+                return Message;
             }
-            else if (excelTable.Columns[2].ColumnName != "宸ュ簭鍚嶇О锛堝敮涓�锛�")
+            else if (excelTable[0].Columns[1].ColumnName != "*宸ュ簭鍚嶇О")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*宸ュ簭鍚嶇О}";
+                return Message;
             }
-            else if (excelTable.Columns[3].ColumnName != "鍚敤鐘舵��")
+            else if (excelTable[0].Columns[2].ColumnName != "*宸ュ簭绫诲瀷")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*宸ュ簭绫诲瀷}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[3].ColumnName != "*鐘舵��")
+            {
+                code = "301";
+                Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*鐘舵�亇";
+                return Message;
+            }
+            else if (excelTable[0].Columns[4].ColumnName != "鎻忚堪")
+            {
+                code = "301";
+                Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鎻忚堪}";
+                return Message;
             }
             else
             {
@@ -1626,47 +1685,39 @@
         #endregion
 
         #region銆怑xcel妯℃澘涓婁紶楠岃瘉,缂洪櫡瀹氫箟妯℃澘銆�
-        public static string Eighteen(string FileCode, out string code)
+        public static string Eighteen(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 != 4)
+            else if (excelTable[0].Columns.Count != 3)
             {
-                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鍒楀簲涓簕缂洪櫡鍚嶇О}";
-                return Message;
-            }
-            else if (excelTable[0].Columns[3].ColumnName != "缂洪櫡鎻忚堪")
-            {
-                code = "300";
-                Message = "缂洪櫡鎻忚堪妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕缂洪櫡鎻忚堪}";
+                code = "301";
+                Message = "缂洪櫡瀹氫箟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕缂洪櫡鎻忚堪}";
                 return Message;
             }
             else
@@ -1988,7 +2039,7 @@
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
                         erro.ErrorField = "{*宀椾綅鍚嶇О}";
-                        erro.ErrorCont = "宀椾綅琛�:{*宀椾綅鍚嶇О}瀛楁" + excelTable[1].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+                        erro.ErrorCont = "宀椾綅琛�:{*宀椾綅鍚嶇О}瀛楁" + excelTable[0].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
                         list.Add(erro);
                     }
                 }
@@ -2052,7 +2103,7 @@
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
                         erro.ErrorField = "{*鐝粍鍚嶇О}";
-                        erro.ErrorCont = "鐝粍琛�:{*鐝粍鍚嶇О}瀛楁" + excelTable[1].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+                        erro.ErrorCont = "鐝粍琛�:{*鐝粍鍚嶇О}瀛楁" + excelTable[0].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
                         list.Add(erro);
                     }
                 }
@@ -2251,7 +2302,7 @@
             DataTable dt;
             List<ExcelErro> list = new List<ExcelErro>();
             list = ImportExcel.InportExcelToTableListErro(excelTable);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
-            //鐝粍琛�
+            //瑙掕壊琛�
             for (int k = 0; k < excelTable[0].Rows.Count; k++)
             {
                 if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
@@ -2278,56 +2329,56 @@
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
                         erro.ErrorField = "{*瑙掕壊鍚嶇О}";
-                        erro.ErrorCont = "瑙掕壊琛�:{*瑙掕壊鍚嶇О}瀛楁" + excelTable[1].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+                        erro.ErrorCont = "瑙掕壊琛�:{*瑙掕壊鍚嶇О}瀛楁" + excelTable[0].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
                         list.Add(erro);
                     }
                 }
-                if (excelTable[0].Rows[k][3].ToString().Trim() != null && excelTable[0].Rows[k][3].ToString().Trim() != "")
-                {
-                    if (excelTable[0].Rows[k][3].ToString().Trim() == "鑷畾涔�")
-                    {
-                        if (excelTable[0].Rows[k][4].ToString().Trim() == null && excelTable[0].Rows[k][4].ToString().Trim() == "")
-                        {
-                            ExcelErro erro = new ExcelErro();
-                            erro.RoeNumber = "/";
-                            erro.ErrorField = "{鏁版嵁鏉冮檺}";
-                            erro.ErrorCont = "瑙掕壊琛�:{鏁版嵁鑼冨洿}瀛楁涓猴細" + excelTable[1].Rows[k][3].ToString().Trim() + "鏃�,{鏁版嵁鏉冮檺}瀛楁涓嶈兘涓虹┖";
-                            list.Add(erro);
-                        }
-                        else
-                        {
-                            //鍒ゆ柇鏁版嵁鏉冮檺缂栫爜鏄惁鍚堢悊
-                            if (excelTable[0].Rows[k][4].ToString().Trim() != null && excelTable[0].Rows[k][4].ToString().Trim() != "")
-                            {
-                                string[] torgcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][4].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[] 
-                                sql = @"select postcode  from TOrganization  where torg_code in @torgcode";
-                                dynamicParams.Add("@torgcode", torgcode);
-                                dt = DapperHelper.selectdata(sql, dynamicParams);
-                                if (dt != null && dt.Rows.Count > 0)
-                                {
-                                    string[] values = excelTable[0].Rows[k][4].ToString().Trim().Split(',');
-                                    var unmatchedValues = values.Except(dt.AsEnumerable().Select(row => row.Field<string>("torg_code")));
-                                    foreach (var value in unmatchedValues)
-                                    {
-                                        ExcelErro erro = new ExcelErro();
-                                        erro.RoeNumber = (k + 1).ToString();
-                                        erro.ErrorField = "{鏁版嵁鏉冮檺}";
-                                        erro.ErrorCont = "瑙掕壊琛�:{鏁版嵁鏉冮檺}瀛楁" + value + " 涓嶆槸鏈夋晥鐨勭粍缁囩紪鐮�";
-                                        list.Add(erro);
-                                    }
-                                }
-                                else
-                                {
-                                    ExcelErro erro = new ExcelErro();
-                                    erro.RoeNumber = (k + 1).ToString();
-                                    erro.ErrorField = "{鏁版嵁鏉冮檺}";
-                                    erro.ErrorCont = "瑙掕壊琛�:{鏁版嵁鏉冮檺}瀛楁" + excelTable[0].Rows[k][4].ToString().Trim() + " 涓嶆槸鏈夋晥鐨勭粍缁囩紪鐮�";
-                                    list.Add(erro);
-                                }
-                            }
-                        }
-                    }
-                }
+                //if (excelTable[0].Rows[k][3].ToString().Trim() != null && excelTable[0].Rows[k][3].ToString().Trim() != "")
+                //{
+                //    if (excelTable[0].Rows[k][3].ToString().Trim() == "鑷畾涔�")
+                //    {
+                //        if (excelTable[0].Rows[k][4].ToString().Trim() == null && excelTable[0].Rows[k][4].ToString().Trim() == "")
+                //        {
+                //            ExcelErro erro = new ExcelErro();
+                //            erro.RoeNumber = "/";
+                //            erro.ErrorField = "{鏁版嵁鏉冮檺}";
+                //            erro.ErrorCont = "瑙掕壊琛�:{鏁版嵁鑼冨洿}瀛楁涓猴細" + excelTable[1].Rows[k][3].ToString().Trim() + "鏃�,{鏁版嵁鏉冮檺}瀛楁涓嶈兘涓虹┖";
+                //            list.Add(erro);
+                //        }
+                //        else
+                //        {
+                //            //鍒ゆ柇鏁版嵁鏉冮檺缂栫爜鏄惁鍚堢悊
+                //            if (excelTable[0].Rows[k][4].ToString().Trim() != null && excelTable[0].Rows[k][4].ToString().Trim() != "")
+                //            {
+                //                string[] torgcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][4].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[] 
+                //                sql = @"select postcode  from TOrganization  where torg_code in @torgcode";
+                //                dynamicParams.Add("@torgcode", torgcode);
+                //                dt = DapperHelper.selectdata(sql, dynamicParams);
+                //                if (dt != null && dt.Rows.Count > 0)
+                //                {
+                //                    string[] values = excelTable[0].Rows[k][4].ToString().Trim().Split(',');
+                //                    var unmatchedValues = values.Except(dt.AsEnumerable().Select(row => row.Field<string>("torg_code")));
+                //                    foreach (var value in unmatchedValues)
+                //                    {
+                //                        ExcelErro erro = new ExcelErro();
+                //                        erro.RoeNumber = (k + 1).ToString();
+                //                        erro.ErrorField = "{鏁版嵁鏉冮檺}";
+                //                        erro.ErrorCont = "瑙掕壊琛�:{鏁版嵁鏉冮檺}瀛楁" + value + " 涓嶆槸鏈夋晥鐨勭粍缁囩紪鐮�";
+                //                        list.Add(erro);
+                //                    }
+                //                }
+                //                else
+                //                {
+                //                    ExcelErro erro = new ExcelErro();
+                //                    erro.RoeNumber = (k + 1).ToString();
+                //                    erro.ErrorField = "{鏁版嵁鏉冮檺}";
+                //                    erro.ErrorCont = "瑙掕壊琛�:{鏁版嵁鏉冮檺}瀛楁" + excelTable[0].Rows[k][4].ToString().Trim() + " 涓嶆槸鏈夋晥鐨勭粍缁囩紪鐮�";
+                //                    list.Add(erro);
+                //                }
+                //            }
+                //        }
+                //    }
+                //}
             }
             if (list.Count > 0)
             {
@@ -2392,24 +2443,21 @@
                         list.Add(erro);
                     }
                 }
-                if (excelTable[0].Rows[j][2].ToString().Trim() != null && excelTable[0].Rows[j][2].ToString().Trim() != "")
-                {
-                    // 浣跨敤Lambda琛ㄨ揪寮忓垽鏂埗绾D鏄惁鍚堢悊
-                    bool isParentIdValid = excelTable[0].AsEnumerable()
-                        .Any(r => Convert.ToString(r["*寰�鏉ュ崟浣嶇被鍨嬬紪鍙�(鍞竴)"]) == excelTable[0].Rows[j][2].ToString().Trim()); // 鍋囪ID鍒楀悕涓篒d
-
-                    // 濡傛灉鐖剁骇ID涓嶅悎鐞嗭紝鍒欒緭鍑�
-                    if (!isParentIdValid)
-                    {
-                        ExcelErro erro = new ExcelErro();
-                        erro.RoeNumber = "/";
-                        erro.ErrorField = "{涓婄骇缂栫爜}";
-                        erro.ErrorCont = "寰�鏉ュ崟浣嶇被鍨嬭〃:{涓婄骇缂栫爜}瀛楁锛�" + excelTable[0].Rows[j][2].ToString().Trim() + " 涓嶅悎鐞�";
-                        list.Add(erro);
-                    }
-                }
             }
+            var invalidRows = excelTable[0].AsEnumerable().Where(row =>
+                       row.Field<string>("涓婄骇缂栫爜") == row.Field<string>("*寰�鏉ュ崟浣嶇被鍨嬬紪鍙�(鍞竴)") ||
+                       (row.Field<string>("涓婄骇缂栫爜") != null && !excelTable[0].AsEnumerable().Any(r => r.Field<string>("*寰�鏉ュ崟浣嶇被鍨嬬紪鍙�(鍞竴)") == row.Field<string>("涓婄骇缂栫爜")))
+                   );
 
+            // 杈撳嚭涓嶅悎鐞嗙殑琛�
+            foreach (var row in invalidRows)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{涓婄骇缂栫爜}";
+                erro.ErrorCont = $"寰�鏉ュ崟浣嶇被鍨嬭〃:*寰�鏉ュ崟浣嶇被鍨嬬紪鍙�(鍞竴)锛� {row.Field<string>("*寰�鏉ュ崟浣嶇被鍨嬬紪鍙�(鍞竴)")} 鐨勪笂绾х紪鐮侊細{row.Field<string>("涓婄骇缂栫爜")}涓嶅悎鐞�";
+                list.Add(erro);
+            }
 
             //寰�鏉ュ崟浣嶈〃
             for (int k = 0; k < excelTable[1].Rows.Count; k++)
@@ -2600,23 +2648,22 @@
                         list.Add(erro);
                     }
                 }
-                if (excelTable[0].Rows[k][3].ToString().Trim() != null && excelTable[0].Rows[k][3].ToString().Trim() != "")
-                {
-                    // 浣跨敤Lambda琛ㄨ揪寮忓垽鏂埗绾D鏄惁鍚堢悊
-                    bool isParentIdValid = excelTable[0].AsEnumerable()
-                        .Any(r => Convert.ToString(r["*搴撲綅缂栧彿(鍞竴)"]) == excelTable[0].Rows[k][3].ToString().Trim()); // 鍋囪ID鍒楀悕涓篒d
-
-                    // 濡傛灉鐖剁骇ID涓嶅悎鐞嗭紝鍒欒緭鍑�
-                    if (!isParentIdValid)
-                    {
-                        ExcelErro erro = new ExcelErro();
-                        erro.RoeNumber = "/";
-                        erro.ErrorField = "{涓婄骇搴撲綅缂栫爜}";
-                        erro.ErrorCont = "搴撲綅琛�:{涓婄骇搴撲綅缂栫爜}瀛楁锛�" + excelTable[0].Rows[k][3].ToString().Trim() + " 涓嶅悎鐞�";
-                        list.Add(erro);
-                    }
-                }
             }
+            var invalidRows = excelTable[0].AsEnumerable().Where(row =>
+                     row.Field<string>("涓婄骇搴撲綅缂栫爜") == row.Field<string>("*搴撲綅缂栧彿(鍞竴)") ||
+                     (row.Field<string>("涓婄骇搴撲綅缂栫爜") != null && !excelTable[0].AsEnumerable().Any(r => r.Field<string>("*搴撲綅缂栧彿(鍞竴)") == row.Field<string>("涓婄骇搴撲綅缂栫爜")))
+                 );
+
+            // 杈撳嚭涓嶅悎鐞嗙殑琛�
+            foreach (var row in invalidRows)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{涓婄骇搴撲綅缂栫爜}";
+                erro.ErrorCont = $"搴撲綅琛�:*搴撲綅缂栧彿(鍞竴)锛� {row.Field<string>("*搴撲綅缂栧彿(鍞竴)")} 鐨勪笂绾у簱浣嶇紪鐮侊細{row.Field<string>("涓婄骇搴撲綅缂栫爜")}涓嶅悎鐞�";
+                list.Add(erro);
+            }
+
             if (list.Count > 0)
             {
                 int index = 0;
@@ -2680,24 +2727,21 @@
                         list.Add(erro);
                     }
                 }
-                if (excelTable[0].Rows[j][2].ToString().Trim() != null && excelTable[0].Rows[j][2].ToString().Trim() != "")
-                {
-                    // 浣跨敤Lambda琛ㄨ揪寮忓垽鏂埗绾D鏄惁鍚堢悊
-                    bool isParentIdValid = excelTable[0].AsEnumerable()
-                        .Any(r => Convert.ToString(r["*瀛樿揣鍒嗙被缂栧彿(鍞竴)"]) == excelTable[0].Rows[j][2].ToString().Trim()); // 鍋囪ID鍒楀悕涓篒d
-
-                    // 濡傛灉鐖剁骇ID涓嶅悎鐞嗭紝鍒欒緭鍑�
-                    if (!isParentIdValid)
-                    {
-                        ExcelErro erro = new ExcelErro();
-                        erro.RoeNumber = "/";
-                        erro.ErrorField = "{涓婄骇缂栫爜}";
-                        erro.ErrorCont = "瀛樿揣鍒嗙被琛�:{涓婄骇缂栫爜}瀛楁锛�" + excelTable[0].Rows[j][2].ToString().Trim() + " 涓嶅悎鐞�";
-                        list.Add(erro);
-                    }
-                }
             }
+            var invalidRows = excelTable[0].AsEnumerable().Where(row =>
+                      row.Field<string>("涓婄骇缂栫爜") == row.Field<string>("*瀛樿揣鍒嗙被缂栧彿(鍞竴)") ||
+                      (row.Field<string>("涓婄骇缂栫爜") != null && !excelTable[0].AsEnumerable().Any(r => r.Field<string>("*瀛樿揣鍒嗙被缂栧彿(鍞竴)") == row.Field<string>("涓婄骇缂栫爜")))
+                  );
 
+            // 杈撳嚭涓嶅悎鐞嗙殑琛�
+            foreach (var row in invalidRows)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{涓婄骇缂栫爜}";
+                erro.ErrorCont = $"瀛樿揣绫诲瀷琛�:*瀛樿揣鍒嗙被缂栧彿(鍞竴)锛� {row.Field<string>("**瀛樿揣鍒嗙被缂栧彿(鍞竴)")} 鐨勪笂绾х紪鐮侊細{row.Field<string>("涓婄骇缂栫爜")}涓嶅悎鐞�";
+                list.Add(erro);
+            }
 
             //瀛樿揣琛�
             for (int k = 0; k < excelTable[1].Rows.Count; k++)
@@ -2730,7 +2774,7 @@
                         list.Add(erro);
                     }
                 }
-                if (excelTable[1].Rows[k][5].ToString().Trim() != null && excelTable[5].Rows[k][1].ToString().Trim() != "")
+                if (excelTable[1].Rows[k][5].ToString().Trim() != null && excelTable[1].Rows[k][5].ToString().Trim() != "")
                 {
                     switch (excelTable[1].Rows[k][5].ToString().Trim())
                     {
@@ -2738,15 +2782,15 @@
                             //鍒ゆ柇璁¢噺鍗曚綅鏄惁涓哄崟璁¢噺
                             if (excelTable[1].Rows[k][6].ToString().Trim() != null && excelTable[1].Rows[k][6].ToString().Trim() != "")
                             {
-                                sql = @"select *  from TUnit where code=@code and isSingleUnit='1'";
-                                dynamicParams.Add("@code", excelTable[1].Rows[k][6].ToString().Trim());
+                                sql = @"select *  from TUnit where name=@name and isSingleUnit='1'";
+                                dynamicParams.Add("@name", excelTable[1].Rows[k][6].ToString().Trim());
                                 dt = DapperHelper.selectdata(sql, dynamicParams);
                                 if (dt.Rows.Count <= 0)
                                 {
                                     ExcelErro erro = new ExcelErro();
                                     erro.RoeNumber = "/";
-                                    erro.ErrorField = "{*璁¢噺鍗曚綅/缁勭紪鐮亇";
-                                    erro.ErrorCont = "瀛樿揣妗f琛�:{*璁¢噺鍗曚綅/缁勭紪鐮亇瀛楁" + excelTable[1].Rows[k][6].ToString().Trim() + "涓嶆槸鏈夋晥鐨勫崟璁¢噺鍗曚綅";
+                                    erro.ErrorField = "{*璁¢噺鍗曚綅/缁勫悕瀛梷";
+                                    erro.ErrorCont = "瀛樿揣妗f琛�:{*璁¢噺鍗曚綅/缁勫悕瀛梷瀛楁" + excelTable[1].Rows[k][6].ToString().Trim() + "涓嶆槸鏈夋晥鐨勫崟璁¢噺鍗曚綅";
                                     list.Add(erro);
                                 }
                             }
@@ -2755,15 +2799,15 @@
                             //鍒ゆ柇璁¢噺鍗曚綅鏄惁涓哄璁¢噺
                             if (excelTable[1].Rows[k][6].ToString().Trim() != null && excelTable[1].Rows[k][6].ToString().Trim() != "")
                             {
-                                sql = @"select *  from TUnitGroup where code=@code";
+                                sql = @"select *  from TUnitGroup where name=@name";
                                 dynamicParams.Add("@code", excelTable[1].Rows[k][6].ToString().Trim());
                                 dt = DapperHelper.selectdata(sql, dynamicParams);
                                 if (dt.Rows.Count <= 0)
                                 {
                                     ExcelErro erro = new ExcelErro();
                                     erro.RoeNumber = "/";
-                                    erro.ErrorField = "{*璁¢噺鍗曚綅/缁勭紪鐮亇";
-                                    erro.ErrorCont = "瀛樿揣妗f琛�:{*璁¢噺鍗曚綅/缁勭紪鐮亇瀛楁" + excelTable[1].Rows[k][6].ToString().Trim() + "涓嶆槸鏈夋晥鐨勫璁¢噺鍗曚綅缁�";
+                                    erro.ErrorField = "{*璁¢噺鍗曚綅/缁勫悕绉皚";
+                                    erro.ErrorCont = "瀛樿揣妗f琛�:{*璁¢噺鍗曚綅/缁勫悕绉皚瀛楁" + excelTable[1].Rows[k][6].ToString().Trim() + "涓嶆槸鏈夋晥鐨勫璁¢噺鍗曚綅缁�";
                                     list.Add(erro);
                                 }
                             }
@@ -2952,7 +2996,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 = "";
@@ -2962,33 +3006,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);
                     }
                 }
@@ -3008,64 +3050,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);
                         }
                     }
@@ -3073,8 +3113,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);
                     }
                 }
@@ -3082,17 +3122,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);
                     }
                 }
@@ -3101,7 +3141,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();
@@ -3110,7 +3150,7 @@
                 ExcelErro erro = new ExcelErro();
                 erro.RoeNumber = "/";
                 erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿}";
-                erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
                 list.Add(erro);
             }
             if (list.Count > 0)
@@ -3135,7 +3175,7 @@
         #endregion
 
         #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧淇濆吇椤圭洰銆�
-        public static List<ExcelErro> ElevenData(string FileCode, out string StuCode, out string message, out int count)
+        public static List<ExcelErro> ElevenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
         {
             message = "";
             StuCode = "";
@@ -3144,33 +3184,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 TEqpmai_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);
                     }
                 }
@@ -3190,64 +3228,62 @@
             {
                 StuCode = "200";
                 message = "鏁版嵁楠岃瘉鎴愬姛";
-                count = excelTable.Rows.Count;
+                count = excelTable[0].Rows.Count;
             }
             return list;
         }
         #endregion
 
         #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧淇濆吇鏍囧噯銆�
-        public static List<ExcelErro> TwentyThreeData(string FileCode, out string StuCode, out string message, out int count)
+        public static List<ExcelErro> Eleven_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 TEqpmai_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.ErrorField = "{*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}";
+                        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());
-                    DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
+                    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[0].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);
                         }
                     }
@@ -3255,8 +3291,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);
                     }
                 }
@@ -3264,17 +3300,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 TEqpmai_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);
                     }
                 }
@@ -3283,7 +3319,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();
@@ -3292,7 +3328,7 @@
                 ExcelErro erro = new ExcelErro();
                 erro.RoeNumber = "/";
                 erro.ErrorField = "{璁惧淇濆吇鏍囧噯缂栧彿}";
-                erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧淇濆吇鏍囧噯椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧淇濆吇鏍囧噯椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
                 list.Add(erro);
             }
             if (list.Count > 0)
@@ -3316,58 +3352,515 @@
         }
         #endregion
 
-        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,宸ヨ娓呭崟銆�
-        public static List<ExcelErro> TwelveData(string FileCode, out string StuCode, out string message, out int count)
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿娓呭崟銆�
+        public static List<ExcelErro> TwelveData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
         {
             message = "";
             StuCode = "";
             count = 0;
             string sql = "";
             DataTable dt;
+            var dynamicParams = new DynamicParameters();
             List<ExcelErro> list = new List<ExcelErro>();
-
+            list = ImportExcel.InportExcelToTableListErro(excelTable);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+          
+            //妯″叿琛�
+            for (int k = 0; k < excelTable[0].Rows.Count; k++)
+            {
+                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldInfo where code=@code";
+                    dynamicParams.Add("@code", excelTable[0].Rows[k][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[k][0].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldInfo where name=@name";
+                    dynamicParams.Add("@name", excelTable[0].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[0].Rows[k][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 TMateriel_Info where partcode=@partcode";
+                    dynamicParams.Add("@partcode", 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);
+                    }
+                }
+            }
+            //鍒ゆ柇妯″叿鍏宠仈浜у搧琛ㄦ槸鍚︽湁鏁版嵁
+            if (excelTable[1].Rows.Count > 0)
+            {
+                //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+                var dt3 = from r in excelTable[1].AsEnumerable()
+                          where !(
+                              from rr in excelTable[0].AsEnumerable()
+                              select rr.Field<string>("*妯″叿缂栧彿(鍞竴)").Trim()
+                          ).Contains(r.Field<string>("妯″叿缂栫爜").Trim())
+                          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)
+            {
+                int index = 0;
+                foreach (ExcelErro item in list)
+                {
+                    index++;
+                    item.Seq = index.ToString();
+                }
+                StuCode = "301";
+                message = "鏁版嵁楠岃瘉澶辫触";
+            }
+            else
+            {
+                StuCode = "200";
+                message = "鏁版嵁楠岃瘉鎴愬姛";
+                count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+            }
             return list;
         }
         #endregion
 
-        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,宸ヨ鐐规銆�
-        public static List<ExcelErro> ThirteenData(string FileCode, out string StuCode, out string message, out int count)
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿鐐规椤圭洰銆�
+        public static List<ExcelErro> ThirteenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
         {
             message = "";
             StuCode = "";
             count = 0;
             string sql = "";
+            var dynamicParams = new DynamicParameters();
             DataTable dt;
             List<ExcelErro> list = new List<ExcelErro>();
-
+            list = ImportExcel.InportExcelToTableListErro(excelTable);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            //妯″叿鐐规椤圭洰琛�
+            for (int k = 0; k < excelTable[0].Rows.Count; k++)
+            {
+                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldchk_Item where code=@code";
+                    dynamicParams.Add("@code", excelTable[0].Rows[k][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[k][0].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldchk_Item where name=@name";
+                    dynamicParams.Add("@name", excelTable[0].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[0].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            if (list.Count > 0)
+            {
+                int index = 0;
+                foreach (ExcelErro item in list)
+                {
+                    index++;
+                    item.Seq = index.ToString();
+                }
+                StuCode = "301";
+                message = "鏁版嵁楠岃瘉澶辫触";
+            }
+            else
+            {
+                StuCode = "200";
+                message = "鏁版嵁楠岃瘉鎴愬姛";
+                count = excelTable[0].Rows.Count;
+            }
             return list;
         }
         #endregion
 
-        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,宸ヨ淇濆吇銆�
-        public static List<ExcelErro> FourteenData(string FileCode, out string StuCode, out string message, out int count)
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿鐐规鏍囧噯銆�
+        public static List<ExcelErro> Thirteen_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;
             List<ExcelErro> list = new List<ExcelErro>();
+            list = ImportExcel.InportExcelToTableListErro(excelTable);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            //妯″叿鐐规鏍囧噯琛ㄦ槸鍚﹀凡瀛樺湪鐐规鏍囧噯
+            for (int j = 0; j < excelTable[0].Rows.Count; j++)
+            {
+                if (excelTable[0].Rows[j][0].ToString().Trim() != null && excelTable[0].Rows[j][0].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldchk_Main where code=@code";
+                    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][0].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+                        list.Add(erro);
+                    }
+                    //閫氳繃妯″叿鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿鐐规椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿鐐规鏍囧噯缂栧彿"].ToString().Trim() == 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][0].ToString().Trim() + " 瀵瑰簲{*妯″叿鐐规椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
+                            list.Add(erro);
+                        }
+                    }
+                    else
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
+                        erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏风偣妫�鏍囧噯椤电妯℃澘涓笉瀛樺湪";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //褰撳墠Excel鏁版嵁涓偣妫�椤归〉绛句腑,妯″叿鐐规椤圭紪鍙�(鍞竴)鍦ㄦā鍏风偣妫�閮ㄤ綅琛ㄤ腑鏄惁瀛樺湪
+            for (int k = 0; k < excelTable[1].Rows.Count; k++)
+            {
+                if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldchk_Item where code=@code and name=@name";
+                    dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+                    dynamicParams.Add("@name", excelTable[1].Rows[k][3].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() +","+ excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏风偣妫�椤逛腑涓嶅瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+            var dt3 = from r in excelTable[1].AsEnumerable()
+                      where !(
+                          from rr in excelTable[0].AsEnumerable()
+                          select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)").Trim()
+                      ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿").Trim())
+                      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)
+            {
+                int index = 0;
+                foreach (ExcelErro item in list)
+                {
+                    index++;
+                    item.Seq = index.ToString();
+                }
+                StuCode = "301";
+                message = "鏁版嵁楠岃瘉澶辫触";
+            }
+            else
+            {
+                StuCode = "200";
+                message = "鏁版嵁楠岃瘉鎴愬姛";
+                count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+            }
+            return list;
+        }
+        #endregion
 
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿淇濆吇椤圭洰銆�
+        public static List<ExcelErro> FourteenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
+        {
+            message = "";
+            StuCode = "";
+            count = 0;
+            string sql = "";
+            var dynamicParams = new DynamicParameters();
+            DataTable dt;
+            List<ExcelErro> list = new List<ExcelErro>();
+            list = ImportExcel.InportExcelToTableListErro(excelTable);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            //妯″叿淇濆吇椤圭洰琛�
+            for (int k = 0; k < excelTable[0].Rows.Count; k++)
+            {
+                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldmai_Item where code=@code";
+                    dynamicParams.Add("@code", excelTable[0].Rows[k][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[k][0].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldmai_Item where name=@name";
+                    dynamicParams.Add("@name", excelTable[0].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[0].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            if (list.Count > 0)
+            {
+                int index = 0;
+                foreach (ExcelErro item in list)
+                {
+                    index++;
+                    item.Seq = index.ToString();
+                }
+                StuCode = "301";
+                message = "鏁版嵁楠岃瘉澶辫触";
+            }
+            else
+            {
+                StuCode = "200";
+                message = "鏁版嵁楠岃瘉鎴愬姛";
+                count = excelTable[0].Rows.Count;
+            }
+            return list;
+        }
+        #endregion
+
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿淇濆吇鏍囧噯銆�
+        public static List<ExcelErro> FourteenData_one(List<DataTable> excelTable, out string StuCode, out string message, out int count)
+        {
+            message = "";
+            StuCode = "";
+            count = 0;
+            string sql = "";
+            var dynamicParams = new DynamicParameters();
+            DataTable dt;
+            List<ExcelErro> list = new List<ExcelErro>();
+            list = ImportExcel.InportExcelToTableListErro(excelTable);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            //妯″叿淇濆吇鏍囧噯琛ㄦ槸鍚﹀凡瀛樺湪淇濆吇鏍囧噯
+            for (int j = 0; j < excelTable[0].Rows.Count; j++)
+            {
+                if (excelTable[0].Rows[j][0].ToString().Trim() != null && excelTable[0].Rows[j][0].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldmai_Main where code=@code";
+                    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][0].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+                        list.Add(erro);
+                    }
+                    //閫氳繃妯″叿淇濆吇鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿淇濆吇椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿淇濆吇鏍囧噯缂栧彿"].ToString().Trim() == 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][0].ToString().Trim() + " 瀵瑰簲{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
+                            list.Add(erro);
+                        }
+                    }
+                    else
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
+                        erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏蜂繚鍏绘爣鍑嗛〉绛炬ā鏉夸腑涓嶅瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //褰撳墠Excel鏁版嵁涓繚鍏婚」椤电涓�,妯″叿淇濆吇椤圭紪鍙�(鍞竴)鍦ㄦā鍏蜂繚鍏婚儴浣嶈〃涓槸鍚﹀瓨鍦�
+            for (int k = 0; k < excelTable[1].Rows.Count; k++)
+            {
+                if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TMouldmai_Item where code=@code and name=@name";
+                    dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+                    dynamicParams.Add("@name", excelTable[1].Rows[k][3].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() + "," + excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏蜂繚鍏婚」涓笉瀛樺湪";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+            var dt3 = from r in excelTable[1].AsEnumerable()
+                      where !(
+                          from rr in excelTable[0].AsEnumerable()
+                          select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)").Trim()
+                      ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿").Trim())
+                      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)
+            {
+                int index = 0;
+                foreach (ExcelErro item in list)
+                {
+                    index++;
+                    item.Seq = index.ToString();
+                }
+                StuCode = "301";
+                message = "鏁版嵁楠岃瘉澶辫触";
+            }
+            else
+            {
+                StuCode = "200";
+                message = "鏁版嵁楠岃瘉鎴愬姛";
+                count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+            }
             return list;
         }
         #endregion
 
         #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,宸ュ簭瀹氫箟銆�
-        public static List<ExcelErro> FifteenData(string FileCode, out string StuCode, out string message, out int count)
+        public static List<ExcelErro> FifteenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
         {
             message = "";
             StuCode = "";
             count = 0;
             string sql = "";
+            var dynamicParams = new DynamicParameters();
             DataTable dt;
             List<ExcelErro> list = new List<ExcelErro>();
-
+            list = ImportExcel.InportExcelToTableListErro(excelTable);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            //宸ュ簭琛�
+            for (int k = 0; k < excelTable[0].Rows.Count; k++)
+            {
+                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TStep where stepcode=@stepcode";
+                    dynamicParams.Add("@stepcode", excelTable[0].Rows[k][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[k][0].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TStep where stepname=@stepname";
+                    dynamicParams.Add("@stepname", excelTable[0].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[0].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            if (list.Count > 0)
+            {
+                int index = 0;
+                foreach (ExcelErro item in list)
+                {
+                    index++;
+                    item.Seq = index.ToString();
+                }
+                StuCode = "301";
+                message = "鏁版嵁楠岃瘉澶辫触";
+            }
+            else
+            {
+                StuCode = "200";
+                message = "鏁版嵁楠岃瘉鎴愬姛";
+                count = excelTable[0].Rows.Count;
+            }
             return list;
         }
         #endregion
@@ -3538,32 +4031,44 @@
         #endregion
 
         #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,缂洪櫡瀹氫箟銆�
-        public static List<ExcelErro> EighteenData(string FileCode, out string StuCode, out string message, out int count)
+        public static List<ExcelErro> EighteenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
         {
             message = "";
             StuCode = "";
             count = 0;
             string sql = "";
-            DataTable dt;
             var dynamicParams = new DynamicParameters();
+            DataTable dt;
             List<ExcelErro> list = new List<ExcelErro>();
-            DataTable excelTable = new DataTable();
-            list = ImportExcel.ExcelToTableErro(FileCode);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
-            excelTable = ImportExcel.ExcelToTable(FileCode);  //鑾峰彇Excel鏁版嵁
-            for (int i = 0; i < excelTable.Rows.Count; i++)
+            list = ImportExcel.InportExcelToTableListErro(excelTable);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            //缂洪櫡琛�
+            for (int k = 0; k < excelTable[0].Rows.Count; k++)
             {
-                if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
+                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
                 {
-                    sql = @"select code  from TDefect where code=@code";
-
-                    dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
+                    sql = @"select *  from TDefect where code=@code";
+                    dynamicParams.Add("@code", excelTable[0].Rows[k][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[k][0].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TDefect where name=@name";
+                    dynamicParams.Add("@name", excelTable[0].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][1].ToString().Trim() + "宸插瓨鍦�";
                         list.Add(erro);
                     }
                 }
@@ -3583,7 +4088,7 @@
             {
                 StuCode = "200";
                 message = "鏁版嵁楠岃瘉鎴愬姛";
-                count = excelTable.Rows.Count;
+                count = excelTable[0].Rows.Count;
             }
             return list;
         }
@@ -4042,28 +4547,28 @@
                 //瀵煎叆瑙掕壊
                 for (int i = 0; i < excelTable[0].Rows.Count; i++)
                 {
-                    if (excelTable[0].Rows[i][3].ToString().Trim() != null && excelTable[0].Rows[i][3].ToString().Trim() != "")
-                    {
-                        //鏁版嵁鑼冨洿
-                        switch (excelTable[0].Rows[i][3].ToString().Trim())
-                        {
-                            case "鍏ㄩ儴":
-                                datarange = "ALL";
-                                break;
-                            case "鏈骇":
-                                datarange = "LEVEL";
-                                break;
-                            case "鏈汉":
-                                datarange = "PERSON";
-                                break;
-                            case "鑷畾涔�":
-                                datarange = "CUSTOM";
-                                datapermissions = excelTable[0].Rows[i][4].ToString().Trim();
-                                break;
-                            default:
-                                break;
-                        }
-                    }
+                    //if (excelTable[0].Rows[i][3].ToString().Trim() != null && excelTable[0].Rows[i][3].ToString().Trim() != "")
+                    //{
+                    //    //鏁版嵁鑼冨洿
+                    //    switch (excelTable[0].Rows[i][3].ToString().Trim())
+                    //    {
+                    //        case "鍏ㄩ儴":
+                    //            datarange = "ALL";
+                    //            break;
+                    //        case "鏈骇":
+                    //            datarange = "LEVEL";
+                    //            break;
+                    //        case "鏈汉":
+                    //            datarange = "PERSON";
+                    //            break;
+                    //        case "鑷畾涔�":
+                    //            datarange = "CUSTOM";
+                    //            datapermissions = excelTable[0].Rows[i][4].ToString().Trim();
+                    //            break;
+                    //        default:
+                    //            break;
+                    //    }
+                    //}
 
                     sql = @"insert into TRole(rolecode,rolename,status,datarange,datapermissions,identifying,description,lm_user,lm_date) 
                             values(@rolecode,@rolename,@status,@datarange,@datapermissions,@identifying,@description,@lm_user,@lm_date)";
@@ -4075,9 +4580,10 @@
                             rolecode = excelTable[0].Rows[i][0].ToString().Trim(),
                             rolename = excelTable[0].Rows[i][1].ToString().Trim(),
                             status = excelTable[0].Rows[i][2].ToString().Trim(),
-                            datarange = datarange,
+                            datarange = "ALL",
                             datapermissions = datapermissions,
-                            description = excelTable[0].Rows[i][5].ToString().Trim(),
+                            identifying="2",
+                            description = excelTable[0].Rows[i][3].ToString().Trim(),
                             lm_user = us.usercode,
                             lm_date = DateTime.Now.ToString()
                         }
@@ -4323,16 +4829,19 @@
                     if (excelTable[1].Rows[i][5].ToString().Trim() == "S")
                     {
                         isSingleUnit = 1;
-                        idunit = excelTable[1].Rows[i][6].ToString().Trim();
+                        sql = @"select * from TUnit  where name=@name and isSingleUnit='1'";
+                        dynamicParams.Add("@name", excelTable[1].Rows[i][6].ToString().Trim());
+                        var dt = DapperHelper.selectdata(sql, dynamicParams);
+                        idunit = dt.Rows[0]["code"].ToString();
                     }
                     if (excelTable[1].Rows[i][5].ToString().Trim() == "M")
                     {
                         sql = @"select T.code,T.name,T.isMainUnit   from TUnitGroup G
                                 inner join TUnit T on G.code=T.idunitgroup
-                                where G.code=@code";
-                        dynamicParams.Add("@code", excelTable[1].Rows[i][6].ToString().Trim());
+                                where G.name=@name";
+                        dynamicParams.Add("@name", excelTable[1].Rows[i][6].ToString().Trim());
                         var dt = DapperHelper.selectdata(sql, dynamicParams);
-                        idunitgroup = excelTable[1].Rows[i][6].ToString().Trim();
+                        idunitgroup = dt.Rows[0]["groupcode"].ToString();
                         idunit = dt.AsEnumerable().Where(row => row.Field<string>("isMainUnit") =="1").Select(row => row.Field<string>("code")).FirstOrDefault();
                         idnounit = dt.AsEnumerable().Where(row => row.Field<string>("isMainUnit") == "0").Select(row => row.Field<string>("code")).FirstOrDefault();
                     }
@@ -4419,15 +4928,15 @@
                             name = excelTable[0].Rows[k][1].ToString().Trim(),
                             lm_user = us.usercode,
                             lm_date = DateTime.Now.ToString(),
-                            idparent = excelTable[0].Rows[k][2].ToString().Trim()
+                            remark = excelTable[0].Rows[k][2].ToString().Trim()
                         }
                     });
                 }
                 //瀵煎叆璁惧
                 for (int i = 0; i < excelTable[1].Rows.Count; i++)
                 {
-                    sql = @"insert into TEqpInfo(code,name,torg_code,eqptype_code,input_date,operation_ration,enable,opc_uom,lm_user,lm_date) 
-                            values(@code,@name,@torg_code,@eqptype_code,@input_date,@operation_ration,@enable,@opc_uom,@lm_user,@lm_date)";
+                    sql = @"insert into TEqpInfo(code,name,torg_code,eqptype_code,operation_ration,enable,opc_uom,lm_user,lm_date) 
+                            values(@code,@name,@torg_code,@eqptype_code,@operation_ration,@enable,@opc_uom,@lm_user,@lm_date)";
                     list.Add(new
                     {
                         str = sql,
@@ -4437,9 +4946,8 @@
                             name = excelTable[1].Rows[i][1].ToString().Trim(),
                             torg_code = excelTable[1].Rows[i][2].ToString().Trim(),
                             eqptype_code = excelTable[1].Rows[i][3].ToString().Trim(),
-                            input_date = excelTable[1].Rows[i][4].ToString().Trim(),
                             operation_ration = "100",
-                            enable = excelTable[1].Rows[i][5].ToString().Trim(),
+                            enable = excelTable[1].Rows[i][4].ToString().Trim(),
                             opc_uom = "鍙�",
                             lm_user = us.usercode,
                             lm_date = DateTime.Now.ToString()
@@ -4468,7 +4976,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 = "";
@@ -4478,13 +4986,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";
@@ -4504,7 +5010,7 @@
                         default:
                             break;
                     }
-                    switch (excelTable.Rows[i][4].ToString().Trim())
+                    switch (excelTable[0].Rows[i][3].ToString().Trim())
                     {
                         case "鏄�":
                             IsScan = "Y";
@@ -4522,12 +5028,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()
                         }
                     });
@@ -4554,7 +5060,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 = "";
@@ -4564,8 +5070,6 @@
             try
             {
                 list.Clear();
-                List<DataTable> excelTable = new List<DataTable>();
-                excelTable = ImportExcel.ExcelToTableList(FileCode);
                 //瀵煎叆璁惧鐐规鏍囧噯涓昏〃
                 for (int k = 0; k < excelTable[0].Rows.Count; k++)
                 {
@@ -4576,12 +5080,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
                         }
                     });
                 }
@@ -4589,7 +5093,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";
@@ -4604,14 +5108,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()
                         }
                     });
@@ -4638,7 +5142,7 @@
         #endregion
 
         #region銆怑xcel鏁版嵁涓婁紶,璁惧淇濆吇椤圭洰銆�
-        public static string ElevenSubmit(string FileCode, string User, out string StuCode)
+        public static string ElevenSubmit(List<DataTable> excelTable, User us, out string StuCode)
         {
             string message = "";
             StuCode = "";
@@ -4648,33 +5152,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())
-                    //{
-                    //    case "骞�":
-                    //        Type = "Y";
-                    //        break;
-                    //    case "瀛�":
-                    //        Type = "S";
-                    //        break;
-                    //    case "鏈�":
-                    //        Type = "M";
-                    //        break;
-                    //    case "鍛�":
-                    //        Type = "W";
-                    //        break;
-                    //    case "鏃�":
-                    //        Type = "D";
-                    //        break;
-                    //    default:
-                    //        break;
-                    //}
-                    switch (excelTable.Rows[i][3].ToString().Trim())
+                    string IsScan = "";
+                    switch (excelTable[0].Rows[i][2].ToString().Trim())
                     {
                         case "鏄�":
                             IsScan = "Y";
@@ -4692,12 +5174,12 @@
                         str = sql,
                         parm = new
                         {
-                            code = excelTable.Rows[i][1].ToString().Trim(),
-                            name = excelTable.Rows[i][2].ToString().Trim(),
-                            descr = excelTable.Rows[i][4].ToString().Trim(),
+                            code = excelTable[0].Rows[i][0].ToString().Trim(),
+                            name = excelTable[0].Rows[i][1].ToString().Trim(),
+                            descr = excelTable[0].Rows[i][3].ToString().Trim(),
                             isscan = IsScan,
                             cycle = "",
-                            Operator = User,
+                            Operator = us.usercode,
                             CreateDate = DateTime.Now.ToString()
                         }
                     });
@@ -4724,7 +5206,7 @@
         #endregion
 
         #region銆怑xcel鏁版嵁涓婁紶,璁惧淇濆吇鏍囧噯銆�
-        public static string TwentyThreeSubmit(string FileCode, string User, out string StuCode)
+        public static string Eleven_oneSubmit(List<DataTable> excelTable, User us, out string StuCode)
         {
             string message = "";
             StuCode = "";
@@ -4734,13 +5216,11 @@
             try
             {
                 list.Clear();
-                List<DataTable> excelTable = new List<DataTable>();
-                excelTable = ImportExcel.ExcelToTableList(FileCode);
                 //瀵煎叆璁惧淇濆吇鏍囧噯涓昏〃
                 for (int k = 0; k < excelTable[0].Rows.Count; k++)
                 {
                     string Type = "";
-                    switch (excelTable[0].Rows[k][3].ToString().Trim())
+                    switch (excelTable[0].Rows[k][2].ToString().Trim())
                     {
                         case "骞�":
                             Type = "Y";
@@ -4764,12 +5244,12 @@
                         str = sql,
                         parm = new
                         {
-                            code = excelTable[0].Rows[k][1].ToString().Trim(),
-                            name = excelTable[0].Rows[k][2].ToString().Trim(),
+                            code = excelTable[0].Rows[k][0].ToString().Trim(),
+                            name = excelTable[0].Rows[k][1].ToString().Trim(),
                             main_cycle = Type,
-                            description = excelTable[0].Rows[k][4].ToString().Trim(),
+                            description = excelTable[0].Rows[k][3].ToString().Trim(),
                             CreateDate = DateTime.Now.ToString(),
-                            Operator = User
+                            Operator = us.usercode
                         }
                     });
                 }
@@ -4783,13 +5263,13 @@
                         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(),
-                            eapmai_code = excelTable[1].Rows[i][2].ToString().Trim(),
-                            description = excelTable[1].Rows[i][5].ToString().Trim(),
-                            isscan = excelTable[1].Rows[i][6].ToString().Trim(),
-                            Operator = User,
+                            seq = excelTable[1].Rows[i][0].ToString().Trim(),
+                            code = excelTable[1].Rows[i][2].ToString().Trim(),
+                            name = excelTable[1].Rows[i][3].ToString().Trim(),
+                            eapmai_code = excelTable[1].Rows[i][1].ToString().Trim(),
+                            description = excelTable[1].Rows[i][4].ToString().Trim(),
+                            isscan = excelTable[1].Rows[i][5].ToString().Trim(),
+                            Operator = us.usercode,
                             CreateDate = DateTime.Now.ToString()
                         }
                     });
@@ -4815,14 +5295,66 @@
         }
         #endregion
 
-        #region銆怑xcel鏁版嵁涓婁紶,宸ヨ娓呭崟銆�
-        public static string TwelveSubmit(string FileCode, string User, out string StuCode)
+        #region銆怑xcel鏁版嵁涓婁紶,妯″叿娓呭崟銆�
+        public static string TwelveSubmit(List<DataTable> excelTable, User us, out string StuCode)
         {
             string message = "";
             StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
-
+                list.Clear();
+                //瀵煎叆妯″叿娓呭崟
+                for (int k = 0; k < excelTable[0].Rows.Count; k++)
+                {
+                    sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date) 
+                               values(@code,@name,@spec,@status,@usestatus,@surp_life,@resi_life,@lm_user,@lm_date)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable[0].Rows[k][0].ToString().Trim(),
+                            name = excelTable[0].Rows[k][1].ToString().Trim(),
+                            spec = excelTable[0].Rows[k][2].ToString().Trim(),
+                            status = excelTable[0].Rows[k][3].ToString().Trim(),
+                            surp_life =decimal.Parse(excelTable[0].Rows[k][4].ToString().Trim()==""?"0": excelTable[0].Rows[k][4].ToString().Trim()),
+                            resi_life = decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()==""?"0":excelTable[0].Rows[k][5].ToString().Trim()),
+                            lm_user = us.usercode,
+                            lm_date = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                //鍐欏叆妯″叿鍏宠仈浜у搧琛�
+                for (int i = 0; i < excelTable[1].Rows.Count; i++)
+                {
+                    sql = @"insert into TMouldInfoPart(mouldcode,partcode,lm_user,lm_date) 
+                               values(@mouldcode,@partcode,@lm_user,@lm_date)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            mouldcode = excelTable[1].Rows[i][0].ToString().Trim(),
+                            partcode = excelTable[1].Rows[i][1].ToString().Trim(),
+                            lm_user = us.usercode,
+                            lm_date = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {
@@ -4833,14 +5365,46 @@
         }
         #endregion
 
-        #region銆怑xcel鏁版嵁涓婁紶,宸ヨ鐐规銆�
-        public static string ThirteenSubmit(string FileCode, string User, out string StuCode)
+        #region銆怑xcel鏁版嵁涓婁紶,妯″叿鐐规椤圭洰銆�
+        public static string ThirteenSubmit(List<DataTable> excelTable, User us, out string StuCode)
         {
             string message = "";
             StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
-
+                list.Clear();
+                //瀵煎叆妯″叿鐐规椤圭洰琛�
+                for (int i = 0; i < excelTable[0].Rows.Count; i++)
+                {
+                    sql = @"insert into TMouldchk_Item(code,name,description,lm_user,lm_date) 
+                            values(@code,@name,@description,@lm_user,@lm_date)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable[0].Rows[i][0].ToString().Trim(),
+                            name = excelTable[0].Rows[i][1].ToString().Trim(),
+                            description = excelTable[0].Rows[i][2].ToString().Trim(),
+                            lm_user = us.usercode,
+                            lm_date = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {
@@ -4851,14 +5415,186 @@
         }
         #endregion
 
-        #region銆怑xcel鏁版嵁涓婁紶,宸ヨ淇濆吇銆�
-        public static string FourteenSubmit(string FileCode, string User, out string StuCode)
+        #region銆怑xcel鏁版嵁涓婁紶,妯″叿鐐规鏍囧噯銆�
+        public static string Thirteen_oneSubmit(List<DataTable> excelTable, User us, out string StuCode)
         {
             string message = "";
             StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
+                list.Clear();
+                //瀵煎叆妯″叿鐐规鏍囧噯涓昏〃
+                for (int k = 0; k < excelTable[0].Rows.Count; k++)
+                {
+                    sql = @"insert into TMouldchk_Main(code,name,description,lm_user,lm_date) 
+                            values(@code,@name,@description,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable[0].Rows[k][0].ToString().Trim(),
+                            name = excelTable[0].Rows[k][1].ToString().Trim(),
+                            description = excelTable[0].Rows[k][2].ToString().Trim(),
+                            CreateDate = DateTime.Now.ToString(),
+                            Operator = us.usercode
+                        }
+                    });
+                }
+                //瀵煎叆妯″叿鐐规鏍囧噯鍏宠仈鐐规椤瑰瓙琛�
+                for (int i = 0; i < excelTable[1].Rows.Count; i++)
+                {
+                    sql = @"insert into TMouldchk_Deta(seq,code,name,mouldchk_main_code,chkdesc,lm_user,lm_date) 
+                            values(@seq,@code,@name,@mouldchk_main_code,@description,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            seq = excelTable[1].Rows[i][1].ToString().Trim(),
+                            code = excelTable[1].Rows[i][2].ToString().Trim(),
+                            name = excelTable[1].Rows[i][3].ToString().Trim(),
+                            mouldchk_main_code = excelTable[1].Rows[i][0].ToString().Trim(),
+                            description = excelTable[1].Rows[i][4].ToString().Trim(),
+                            Operator = us.usercode,
+                            CreateDate = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
+            }
+            catch (Exception e)
+            {
+                StuCode = "300";
+                message = e.Message;
+            }
+            return message;
+        }
+        #endregion
 
+        #region銆怑xcel鏁版嵁涓婁紶,妯″叿淇濆吇椤圭洰銆�
+        public static string FourteenSubmit(List<DataTable> excelTable, User us, out string StuCode)
+        {
+            string message = "";
+            StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                list.Clear();
+                //瀵煎叆妯″叿淇濆吇椤圭洰琛�
+                for (int i = 0; i < excelTable[0].Rows.Count; i++)
+                {
+                    sql = @"insert into TMouldmai_Item(code,name,description,lm_user,lm_date) 
+                            values(@code,@name,@description,@lm_user,@lm_date)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable[0].Rows[i][0].ToString().Trim(),
+                            name = excelTable[0].Rows[i][1].ToString().Trim(),
+                            description = excelTable[0].Rows[i][2].ToString().Trim(),
+                            lm_user = us.usercode,
+                            lm_date = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
+            }
+            catch (Exception e)
+            {
+                StuCode = "300";
+                message = e.Message;
+            }
+            return message;
+        }
+        #endregion
+
+        #region銆怑xcel鏁版嵁涓婁紶,妯″叿淇濆吇鏍囧噯銆�
+        public static string Fourteen_oneSubmit(List<DataTable> excelTable, User us, out string StuCode)
+        {
+            string message = "";
+            StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                list.Clear();
+                //瀵煎叆妯″叿淇濆吇鏍囧噯涓昏〃
+                for (int k = 0; k < excelTable[0].Rows.Count; k++)
+                {
+                    sql = @"insert into TMouldmai_Main(code,name,description,lm_user,lm_date) 
+                            values(@code,@name,@description,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable[0].Rows[k][0].ToString().Trim(),
+                            name = excelTable[0].Rows[k][1].ToString().Trim(),
+                            description = excelTable[0].Rows[k][2].ToString().Trim(),
+                            CreateDate = DateTime.Now.ToString(),
+                            Operator = us.usercode
+                        }
+                    });
+                }
+                //瀵煎叆妯″叿淇濆吇鏍囧噯鍏宠仈淇濆吇椤瑰瓙琛�
+                for (int i = 0; i < excelTable[1].Rows.Count; i++)
+                {
+                    sql = @"insert into TMouldmai_Deta(seq,code,name,mouldmai_main_code,chkdesc,lm_user,lm_date) 
+                            values(@seq,@code,@name,@mouldmai_main_code,@description,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            seq = excelTable[1].Rows[i][1].ToString().Trim(),
+                            code = excelTable[1].Rows[i][2].ToString().Trim(),
+                            name = excelTable[1].Rows[i][3].ToString().Trim(),
+                            mouldmai_main_code = excelTable[1].Rows[i][0].ToString().Trim(),
+                            description = excelTable[1].Rows[i][4].ToString().Trim(),
+                            Operator = us.usercode,
+                            CreateDate = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {
@@ -4870,13 +5606,47 @@
         #endregion
 
         #region銆怑xcel鏁版嵁涓婁紶,宸ュ簭瀹氫箟銆�
-        public static string FifteenSubmit(string FileCode, string User, out string StuCode)
+        public static string FifteenSubmit(List<DataTable> excelTable, User us, out string StuCode)
         {
             string message = "";
             StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
-
+                list.Clear();
+                //瀵煎叆宸ュ簭
+                for (int i = 0; i < excelTable[0].Rows.Count; i++)
+                {
+                    sql = @"insert into TStep(stepcode,stepname,enable,descr,flwtype,lm_user,lm_date) 
+                            values(@stepcode,@stepname,@enable,@descr,@flwtype,@lm_user,@lm_date)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            stepcode = excelTable[0].Rows[i][0].ToString().Trim(),
+                            stepname = excelTable[0].Rows[i][1].ToString().Trim(),
+                            enable = excelTable[0].Rows[i][3].ToString().Trim(),
+                            descr = excelTable[0].Rows[i][4].ToString().Trim(),
+                            flwtype = excelTable[0].Rows[i][2].ToString().Trim(),
+                            lm_user = us.usercode,
+                            lm_date = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {
@@ -5086,34 +5856,32 @@
         #endregion
 
         #region銆怑xcel鏁版嵁涓婁紶,缂洪櫡瀹氫箟銆�
-        public static string EighteenSubmit(string FileCode, string User, out string StuCode)
+        public static string EighteenSubmit(List<DataTable> excelTable, User us, out string StuCode)
         {
             string message = "";
             StuCode = "";
             string sql = "";
-            DataTable dt;
             List<object> list = new List<object>();
             var dynamicParams = new DynamicParameters();
             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++)
                 {
-                    sql = @"insert into TDefect(code,name,descr,lm_user,lm_date) 
-                            values(@code,@name,@descr,@Operator,@CreateDate)";
+                    sql = @"insert into TDefect(code,name,description,is_step,lm_user,lm_date) 
+                            values(@code,@name,@description,@is_step,@lm_user,@lm_date)";
                     list.Add(new
                     {
                         str = sql,
                         parm = new
                         {
-                            code = excelTable.Rows[i][1].ToString().Trim(),
-                            name = excelTable.Rows[i][2].ToString().Trim(),
-                            descr = excelTable.Rows[i][3].ToString().Trim(),
-                            Operator = User,
-                            CreateDate = DateTime.Now.ToString()
+                            code = excelTable[0].Rows[i][0].ToString().Trim(),
+                            name = excelTable[0].Rows[i][1].ToString().Trim(),
+                            description = excelTable[0].Rows[i][2].ToString().Trim(),
+                            is_step="N",
+                            lm_user = us.usercode,
+                            lm_date = DateTime.Now.ToString()
                         }
                     });
                 }

--
Gitblit v1.9.3