From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联

---
 VueWebCoreApi/Tools/ImportExcelData.cs | 1290 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 925 insertions(+), 365 deletions(-)

diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index e0724aa..5a7c185 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -690,59 +690,51 @@
         #endregion
 
         #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规椤圭洰妯℃澘銆�
-        public static string Ten(string FileCode, out string code)
+        public static string Ten(List<DataTable> excelTable, out string code)
         {
             string Message = "";
             code = "";
-            List<DataTable> excelTable = new List<DataTable>();
-            excelTable = ImportExcel.ExcelToTableList(FileCode);
-            if (excelTable.Count != 2)
+            if (excelTable.Count != 1)
             {
-                code = "300";
+                code = "301";
                 Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
                 return Message;
 
             }
-            else if (excelTable[0].Columns.Count != 6)
+            else if (excelTable[0].Columns.Count != 5)
             {
-                code = "300";
+                code = "301";
                 Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
                 return Message;
             }
-            else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+            else if (excelTable[0].Columns[0].ColumnName != "*鐐规椤圭洰缂栧彿(鍞竴)")
             {
-                code = "300";
-                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+                code = "301";
+                Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*鐐规椤圭洰缂栧彿(鍞竴)}";
                 return Message;
             }
-            else if (excelTable[0].Columns[1].ColumnName != "鐐规椤圭洰缂栧彿(鍞竴)")
+            else if (excelTable[0].Columns[1].ColumnName != "*鐐规椤圭洰鍚嶇О")
             {
-                code = "300";
-                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕鐐规椤圭洰缂栧彿(鍞竴)}";
+                code = "301";
+                Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*鐐规椤圭洰鍚嶇О}";
                 return Message;
             }
-            else if (excelTable[0].Columns[2].ColumnName != "鐐规椤圭洰鍚嶇О")
+            else if (excelTable[0].Columns[2].ColumnName != "*鐐规鍛ㄦ湡")
             {
-                code = "300";
-                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕鐐规椤圭洰鍚嶇О}";
+                code = "301";
+                Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鐐规鍛ㄦ湡}";
                 return Message;
             }
-            else if (excelTable[0].Columns[3].ColumnName != "鐐规鍛ㄦ湡")
+            else if (excelTable[0].Columns[3].ColumnName != "*鏄惁鎵爜")
             {
-                code = "300";
-                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规鍛ㄦ湡}";
+                code = "301";
+                Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鏄惁鎵爜}";
                 return Message;
             }
-            else if (excelTable[0].Columns[4].ColumnName != "鏄惁鎵爜")
+            else if (excelTable[0].Columns[4].ColumnName != "鐐规椤圭洰瑕佹眰")
             {
-                code = "300";
-                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
-                return Message;
-            }
-            else if (excelTable[0].Columns[5].ColumnName != "鐐规椤圭洰瑕佹眰")
-            {
-                code = "300";
-                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规椤圭洰瑕佹眰}";
+                code = "301";
+                Message = "璁惧鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鐐规椤圭洰瑕佹眰}";
                 return Message;
             }
             else
@@ -755,107 +747,93 @@
         #endregion
 
         #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规鏍囧噯妯℃澘銆�
-        public static string TwentyTwo(string FileCode, out string code)
+        public static string Ten_one(List<DataTable> excelTable, out string code)
         {
             string Message = "";
             code = "";
-            List<DataTable> excelTable = new List<DataTable>();
-            excelTable = ImportExcel.ExcelToTableList(FileCode);
-            if (excelTable.Count != 4)
+            if (excelTable.Count != 2)
             {
                 code = "300";
                 Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
                 return Message;
 
             }
-            else if (excelTable[0].Columns.Count != 5)
+            else if (excelTable[0].Columns.Count != 4)
             {
                 code = "300";
                 Message = "璁惧鐐规鏍囧噯椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
                 return Message;
             }
-            else if (excelTable[1].Columns.Count != 8)
+            else if (excelTable[1].Columns.Count != 7)
             {
                 code = "300";
                 Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
                 return Message;
             }
-            else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+            else if (excelTable[0].Columns[0].ColumnName != "*璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
             {
                 code = "300";
-                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
                 return Message;
             }
-            else if (excelTable[0].Columns[1].ColumnName != "璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
+            else if (excelTable[0].Columns[1].ColumnName != "*璁惧鐐规鏍囧噯鍚嶇О")
             {
                 code = "300";
-                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*璁惧鐐规鏍囧噯鍚嶇О}";
                 return Message;
             }
-            else if (excelTable[0].Columns[2].ColumnName != "璁惧鐐规鏍囧噯鍚嶇О")
+            else if (excelTable[0].Columns[2].ColumnName != "*鐐规绠℃帶")
             {
                 code = "300";
-                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧鐐规鏍囧噯鍚嶇О}";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鐐规绠℃帶}";
                 return Message;
             }
-            else if (excelTable[0].Columns[3].ColumnName != "鐐规绠℃帶")
+            else if (excelTable[0].Columns[3].ColumnName != "鏍囧噯鎻忚堪")
             {
                 code = "300";
-                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鐐规绠℃帶}";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鏍囧噯鎻忚堪}";
                 return Message;
             }
-            else if (excelTable[0].Columns[4].ColumnName != "鏍囧噯鎻忚堪")
+            else if (excelTable[1].Columns[0].ColumnName != "*璁惧鐐规鏍囧噯缂栧彿(M)")
             {
                 code = "300";
-                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鏍囧噯鎻忚堪}";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*璁惧鐐规鏍囧噯缂栧彿(M)}";
                 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
@@ -868,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";
@@ -881,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鍒楀簲涓簕淇濆吇椤圭洰瑕佹眰}";
@@ -927,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 != "*璁惧淇濆吇鏍囧噯缂栧彿(M)")
             {
                 code = "300";
-                Message = "璁惧淇濆吇鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鏍囧噯鎻忚堪}";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*璁惧淇濆吇鏍囧噯缂栧彿(M)}";
                 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
@@ -1045,16 +1001,31 @@
                 return Message;
 
             }
-            else if (excelTable[0].Columns.Count != 7)
+            if (excelTable[1].Rows.Count > 0)
+            {
+                if (excelTable[1].Columns.Count != 2)
+                {
+                    code = "301";
+                    Message = "妯″叿鍏宠仈浜у搧妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                    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[0].Columns.Count != 8)
             {
                 code = "301";
                 Message = "妯″叿娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
-                return Message;
-            }
-            else if (excelTable[1].Columns.Count != 2)
-            {
-                code = "301";
-                Message = "妯″叿鍏宠仈浜у搧妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
                 return Message;
             }
             else if (excelTable[0].Columns[0].ColumnName != "*妯″叿缂栧彿(鍞竴)")
@@ -1063,52 +1034,46 @@
                 Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿缂栧彿(鍞竴)}";
                 return Message;
             }
-            else if (excelTable[1].Columns[1].ColumnName != "*妯″叿鍚嶇О")
+            else if (excelTable[0].Columns[1].ColumnName != "*妯″叿鍚嶇О")
             {
                 code = "301";
                 Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*妯″叿鍚嶇О}";
                 return Message;
             }
-            else if (excelTable[1].Columns[2].ColumnName != "瑙勬牸鍨嬪彿")
+            else if (excelTable[0].Columns[2].ColumnName != "瑙勬牸鍨嬪彿")
             {
                 code = "301";
                 Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑙勬牸鍨嬪彿}";
                 return Message;
             }
-            else if (excelTable[1].Columns[3].ColumnName != "*鐘舵��")
+            else if (excelTable[0].Columns[3].ColumnName != "*鐘舵��")
             {
                 code = "301";
                 Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*鐘舵�亇";
                 return Message;
             }
-            else if (excelTable[1].Columns[4].ColumnName != "*浠撳簱缂栫爜")
+            else if (excelTable[0].Columns[4].ColumnName != "*浠撳簱缂栫爜")
             {
                 code = "301";
                 Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*浠撳簱缂栫爜}";
                 return Message;
             }
-            else if (excelTable[0].Columns[5].ColumnName != "棰勮瀵垮懡(娆�)")
+            else if (excelTable[0].Columns[5].ColumnName != "*搴撲綅缂栫爜")
             {
                 code = "301";
-                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕*搴撲綅缂栫爜}";
                 return Message;
             }
-            else if (excelTable[0].Columns[6].ColumnName != "鍓╀綑瀵垮懡(娆�)")
+            else if (excelTable[0].Columns[6].ColumnName != "棰勮瀵垮懡(娆�)")
             {
                 code = "301";
-                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
                 return Message;
             }
-            else if (excelTable[1].Columns[0].ColumnName != "妯″叿缂栫爜")
+            else if (excelTable[0].Columns[7].ColumnName != "鍓╀綑瀵垮懡(娆�)")
             {
                 code = "301";
-                Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕妯″叿缂栫爜}";
-                return Message;
-            }
-            else if (excelTable[0].Columns[1].ColumnName != "浜у搧缂栫爜")
-            {
-                code = "301";
-                Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕浜у搧缂栫爜}";
+                Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
                 return Message;
             }
             else
@@ -1165,82 +1130,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 != "*妯″叿鐐规鏍囧噯缂栧彿(M)")
             {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                code = "301";
+                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿鐐规鏍囧噯缂栧彿(M)}";
+                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 != "*妯″叿淇濆吇鏍囧噯缂栧彿(M)")
+            {
+                code = "301";
+                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯缂栧彿(M)}";
+                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
             {
@@ -2750,7 +2836,7 @@
                     sql = @"select *  from TSecStck where code=@code";
                     dynamicParams.Add("@code", excelTable[1].Rows[k][7].ToString().Trim());
                     dt = DapperHelper.selectdata(sql, dynamicParams);
-                    if (dt.Rows.Count<=0)
+                    if (dt.Rows.Count <= 0)
                     {
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
@@ -2877,7 +2963,7 @@
                     sql = @"select *  from TOrganization where torg_code=@torg_code";
                     dynamicParams.Add("@torg_code", excelTable[1].Rows[k][2].ToString().Trim());
                     dt = DapperHelper.selectdata(sql, dynamicParams);
-                    if (dt.Rows.Count<=0)
+                    if (dt.Rows.Count <= 0)
                     {
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
@@ -2925,7 +3011,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 = "";
@@ -2935,33 +3021,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);
                     }
                 }
@@ -2981,64 +3065,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.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());
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*璁惧鐐规鏍囧噯缂栧彿(M)"].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 = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 瀵瑰簲{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
                             list.Add(erro);
                         }
                     }
@@ -3046,8 +3128,8 @@
                     {
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
-                        erro.ErrorField = "{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
-                        erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 鍦ㄨ澶囩偣妫�鏍囧噯椤电妯℃澘涓笉瀛樺湪";
+                        erro.ErrorField = "{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧鐐规鏍囧噯妯℃澘sheet1涓�:{*璁惧鐐规鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄨ澶囩偣妫�鏍囧噯妯℃澘sheet涓瓄*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}鍒椾笉瀛樺湪";
                         list.Add(erro);
                     }
                 }
@@ -3055,17 +3137,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)
+                    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);
                     }
                 }
@@ -3074,16 +3156,16 @@
             var dt3 = from r in excelTable[1].AsEnumerable()
                       where !(
                           from rr in excelTable[0].AsEnumerable()
-                          select rr.Field<string>("璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
-                      ).Contains(r.Field<string>("璁惧鐐规鏍囧噯缂栧彿"))
+                          select rr.Field<string>("*璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
+                      ).Contains(r.Field<string>("*璁惧鐐规鏍囧噯缂栧彿(M)"))
                       select r;
             List<DataRow> listRow = dt3.ToList();
             if (listRow.Count > 0)
             {
                 ExcelErro erro = new ExcelErro();
                 erro.RoeNumber = "/";
-                erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿}";
-                erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                erro.ErrorField = "{*璁惧鐐规鏍囧噯缂栧彿(M)}";
+                erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(M)}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
                 list.Add(erro);
             }
             if (list.Count > 0)
@@ -3108,7 +3190,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 = "";
@@ -3117,33 +3199,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);
                     }
                 }
@@ -3163,64 +3243,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["*璁惧淇濆吇鏍囧噯缂栧彿(M)"].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 = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 瀵瑰簲{*璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
                             list.Add(erro);
                         }
                     }
@@ -3228,8 +3306,8 @@
                     {
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
-                        erro.ErrorField = "{璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}";
-                        erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 鍦ㄨ澶囦繚鍏绘爣鍑嗛〉绛炬ā鏉夸腑涓嶅瓨鍦�";
+                        erro.ErrorField = "{*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧淇濆吇鏍囧噯妯℃澘sheet1涓�:{*璁惧淇濆吇鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄨ澶囦繚鍏绘爣鍑嗘ā鏉縮heet涓瓄*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}鍒椾笉瀛樺湪";
                         list.Add(erro);
                     }
                 }
@@ -3237,17 +3315,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)
+                    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);
                     }
                 }
@@ -3256,16 +3334,16 @@
             var dt3 = from r in excelTable[1].AsEnumerable()
                       where !(
                           from rr in excelTable[0].AsEnumerable()
-                          select rr.Field<string>("璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)")
-                      ).Contains(r.Field<string>("璁惧淇濆吇鏍囧噯缂栧彿"))
+                          select rr.Field<string>("*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)")
+                      ).Contains(r.Field<string>("*璁惧淇濆吇鏍囧噯缂栧彿(M)"))
                       select r;
             List<DataRow> listRow = dt3.ToList();
             if (listRow.Count > 0)
             {
                 ExcelErro erro = new ExcelErro();
                 erro.RoeNumber = "/";
-                erro.ErrorField = "{璁惧淇濆吇鏍囧噯缂栧彿}";
-                erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧淇濆吇鏍囧噯椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                erro.ErrorField = "{*璁惧淇濆吇鏍囧噯缂栧彿(M)}";
+                erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿(M)}瀛楁涓湁鍊煎湪璁惧淇濆吇鏍囧噯椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
                 list.Add(erro);
             }
             if (list.Count > 0)
@@ -3300,7 +3378,7 @@
             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++)
             {
@@ -3332,6 +3410,61 @@
                         list.Add(erro);
                     }
                 }
+                //鍒ゆ柇浠撳簱缂栫爜鏄惁涓虹┖
+                if (excelTable[0].Rows[k][4].ToString().Trim() != null && excelTable[0].Rows[k][4].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TSecStck where code=@code";
+                    dynamicParams.Add("@code", excelTable[0].Rows[k][4].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][4].ToString().Trim() + "涓嶅瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+                //鍒ゆ柇搴撲綅缂栫爜鏄惁涓虹┖
+                if (excelTable[0].Rows[k][5].ToString().Trim() != null && excelTable[0].Rows[k][5].ToString().Trim() != "")
+                {
+                    //搴撲綅涓嶄负绌烘椂,鍒ゆ柇浠撳簱鏄惁涓虹┖
+                    if (excelTable[0].Rows[k][4].ToString().Trim() != null && excelTable[0].Rows[k][4].ToString().Trim() != "")
+                    {
+                        //鍒ゆ柇搴撲綅鏄惁瀛樺湪
+                        sql = @"select *  from TSecLoca where code=@code";
+                        dynamicParams.Add("@code", excelTable[0].Rows[k][5].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][5].ToString().Trim() + "涓嶅瓨鍦�";
+                            list.Add(erro);
+                        }
+                        else
+                        {
+                            //鍒ゆ柇搴撲綅鏄惁灞炰簬褰撳墠浠撳簱
+                            if (excelTable[0].Rows[k][4].ToString().Trim() != dt.Rows[0]["idwarehouse"].ToString())
+                            {
+                                ExcelErro erro = new ExcelErro();
+                                erro.RoeNumber = "/";
+                                erro.ErrorField = "{*搴撲綅缂栫爜}";
+                                erro.ErrorCont = "妯″叿琛�:{*搴撲綅缂栫爜}瀛楁" + excelTable[0].Rows[k][5].ToString().Trim() + "涓巤*浠撳簱缂栫爜}瀛楁锛�" + excelTable[0].Rows[k][4].ToString().Trim() + "涓嶅尮閰�";
+                                list.Add(erro);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{*搴撲綅缂栫爜}";
+                        erro.ErrorCont = "妯″叿琛�:{*搴撲綅缂栫爜}瀛楁" + excelTable[0].Rows[k][5].ToString().Trim() + "瀵瑰簲鐨勪粨搴撳瓧娈典笉鑳戒负绌�";
+                        list.Add(erro);
+                    }
+                }
             }
             //妯″叿鍏宠仈浜у搧琛�
             for (int j = 0; j < excelTable[1].Rows.Count; j++)
@@ -3341,7 +3474,7 @@
                     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)
+                    if (dt.Rows.Count <= 0)
                     {
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
@@ -3358,8 +3491,8 @@
                 var dt3 = from r in excelTable[1].AsEnumerable()
                           where !(
                               from rr in excelTable[0].AsEnumerable()
-                              select rr.Field<string>("*妯″叿缂栧彿(鍞竴)")
-                          ).Contains(r.Field<string>("妯″叿缂栫爜"))
+                              select rr.Field<string>("*妯″叿缂栧彿(鍞竴)").Trim()
+                          ).Contains(r.Field<string>("妯″叿缂栫爜").Trim())
                           select r;
                 List<DataRow> listRow = dt3.ToList();
                 if (listRow.Count > 0)
@@ -3430,7 +3563,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);
                     }
                 }
@@ -3456,16 +3589,284 @@
         }
         #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["*妯″叿鐐规鏍囧噯缂栧彿(M)"].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 = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 瀵瑰簲{*妯″叿鐐规椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
+                            list.Add(erro);
+                        }
+                    }
+                    else
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "妯″叿鐐规鏍囧噯妯℃澘sheet1涓�:{*妯″叿鐐规鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏风偣妫�鏍囧噯妯℃澘sheet涓瓄*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}鍒椾笉瀛樺湪";
+                        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>("*妯″叿鐐规鏍囧噯缂栧彿(M)").Trim())
+                      select r;
+            List<DataRow> listRow = dt3.ToList();
+            if (listRow.Count > 0)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{*妯″叿鐐规鏍囧噯缂栧彿(M)}";
+                erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿(M)}瀛楁涓湁鍊煎湪妯″叿鐐规鏍囧噯椤电妯℃澘:{*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                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["*妯″叿淇濆吇鏍囧噯缂栧彿(M)"].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 = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 瀵瑰簲{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
+                            list.Add(erro);
+                        }
+                    }
+                    else
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "妯″叿淇濆吇鏍囧噯妯℃澘sheet1涓�:{*妯″叿淇濆吇鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏蜂繚鍏绘爣鍑嗘ā鏉縮heet涓瓄*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}鍒椾笉瀛樺湪";
+                        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>("*妯″叿淇濆吇鏍囧噯缂栧彿(M)").Trim())
+                      select r;
+            List<DataRow> listRow = dt3.ToList();
+            if (listRow.Count > 0)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{*妯″叿淇濆吇鏍囧噯缂栧彿(M)}";
+                erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿(M)}瀛楁涓湁鍊煎湪妯″叿淇濆吇鏍囧噯椤电妯℃澘:{*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                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
@@ -4251,7 +4652,7 @@
                             status = excelTable[0].Rows[i][2].ToString().Trim(),
                             datarange = "ALL",
                             datapermissions = datapermissions,
-                            identifying="2",
+                            identifying = "2",
                             description = excelTable[0].Rows[i][3].ToString().Trim(),
                             lm_user = us.usercode,
                             lm_date = DateTime.Now.ToString()
@@ -4420,6 +4821,21 @@
                 //瀵煎叆搴撲綅
                 for (int i = 0; i < excelTable[0].Rows.Count; i++)
                 {
+                    string status = "";
+                    if (excelTable[0].Rows[i][4].ToString().Trim() != null && excelTable[0].Rows[i][4].ToString().Trim() != "")
+                    {
+                        switch (excelTable[0].Rows[i][3].ToString().Trim())
+                        {
+                            case "姝e父":
+                                status = "Y";
+                                break;
+                            case "鍋滅敤":
+                                status = "N";
+                                break;
+                            default:
+                                break;
+                        }
+                    }
                     sql = @"insert into TSecLoca(code,name,idwarehouse,idparent,status,description,lm_user,lm_date,data_sources) 
                             values(@code,@name,@idwarehouse,@idparent,@status,@description,@lm_user,@lm_date,@data_sources)";
                     list.Add(new
@@ -4431,7 +4847,7 @@
                             name = excelTable[0].Rows[i][1].ToString().Trim(),
                             idwarehouse = excelTable[0].Rows[i][2].ToString().Trim(),
                             idparent = excelTable[0].Rows[i][3].ToString().Trim(),
-                            status = excelTable[0].Rows[i][4].ToString().Trim(),
+                            status = status,
                             description = excelTable[0].Rows[i][5].ToString().Trim(),
                             lm_user = us.usercode,
                             lm_date = DateTime.Now.ToString(),
@@ -4493,7 +4909,7 @@
                 //瀵煎叆瀛樿揣妗f
                 for (int i = 0; i < excelTable[1].Rows.Count; i++)
                 {
-                    string idunitgroup="", idunit = "", idnounit = "";
+                    string idunitgroup = "", idunit = "", idnounit = "";
                     int isSingleUnit = 0;
                     if (excelTable[1].Rows[i][5].ToString().Trim() == "S")
                     {
@@ -4511,7 +4927,7 @@
                         dynamicParams.Add("@name", excelTable[1].Rows[i][6].ToString().Trim());
                         var dt = DapperHelper.selectdata(sql, dynamicParams);
                         idunitgroup = dt.Rows[0]["groupcode"].ToString();
-                        idunit = dt.AsEnumerable().Where(row => row.Field<string>("isMainUnit") =="1").Select(row => row.Field<string>("code")).FirstOrDefault();
+                        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();
                     }
 
@@ -4645,7 +5061,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 = "";
@@ -4655,13 +5071,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";
@@ -4681,7 +5095,7 @@
                         default:
                             break;
                     }
-                    switch (excelTable.Rows[i][4].ToString().Trim())
+                    switch (excelTable[0].Rows[i][3].ToString().Trim())
                     {
                         case "鏄�":
                             IsScan = "Y";
@@ -4699,12 +5113,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()
                         }
                     });
@@ -4731,7 +5145,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 = "";
@@ -4741,8 +5155,6 @@
             try
             {
                 list.Clear();
-                List<DataTable> excelTable = new List<DataTable>();
-                excelTable = ImportExcel.ExcelToTableList(FileCode);
                 //瀵煎叆璁惧鐐规鏍囧噯涓昏〃
                 for (int k = 0; k < excelTable[0].Rows.Count; k++)
                 {
@@ -4753,12 +5165,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
                         }
                     });
                 }
@@ -4766,7 +5178,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";
@@ -4782,13 +5194,13 @@
                         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(),
+                            code = excelTable[1].Rows[i][2].ToString().Trim(),
+                            name = excelTable[1].Rows[i][3].ToString().Trim(),
+                            eqpchk_main_code = excelTable[1].Rows[i][0].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()
                         }
                     });
@@ -4815,7 +5227,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 = "";
@@ -4825,33 +5237,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";
@@ -4869,12 +5259,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()
                         }
                     });
@@ -4901,7 +5291,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 = "";
@@ -4911,13 +5301,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";
@@ -4941,12 +5329,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
                         }
                     });
                 }
@@ -4961,12 +5349,12 @@
                         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,
+                            code = excelTable[1].Rows[i][2].ToString().Trim(),
+                            name = excelTable[1].Rows[i][3].ToString().Trim(),
+                            eapmai_code = excelTable[1].Rows[i][0].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()
                         }
                     });
@@ -5006,8 +5394,8 @@
                 //瀵煎叆妯″叿娓呭崟
                 for (int k = 0; k < excelTable[0].Rows.Count; k++)
                 {
-                    sql = @"insert into TMouldInfo(code,name,spec,status,usestatus,warehousecode,surp_life,resi_life,lm_user,lm_date) 
-                               values(@code,@name,@spec,@status,@usestatus,@warehousecode,@surp_life,@resi_life,@lm_user,@lm_date)";
+                    sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date,warehousecode,location_code) 
+                               values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date,@warehousecode,@location_code)";
                     list.Add(new
                     {
                         str = sql,
@@ -5016,11 +5404,11 @@
                             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()=="姝e父"?"Y":"N",
-                            usestatus = "0",//浣跨敤鐘舵�侊細鍦ㄥ簱/鍑哄簱/涓婃満/涓嬫満/缁翠慨/澶栧��(0,1,2,3,4,5)
+                            status = excelTable[0].Rows[k][3].ToString().Trim(),
                             warehousecode = excelTable[0].Rows[k][4].ToString().Trim(),
-                            surp_life =decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()),
-                            resi_life = decimal.Parse(excelTable[0].Rows[k][6].ToString().Trim()),
+                            location_code = excelTable[0].Rows[k][5].ToString().Trim(),
+                            surp_life = decimal.Parse(excelTable[0].Rows[k][6].ToString().Trim() == "" ? "0" : excelTable[0].Rows[k][6].ToString().Trim()),
+                            resi_life = decimal.Parse(excelTable[0].Rows[k][7].ToString().Trim() == "" ? "0" : excelTable[0].Rows[k][7].ToString().Trim()),
                             lm_user = us.usercode,
                             lm_date = DateTime.Now.ToString()
                         }
@@ -5114,14 +5502,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)
             {
@@ -5406,7 +5966,7 @@
                             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",
+                            is_step = "N",
                             lm_user = us.usercode,
                             lm_date = DateTime.Now.ToString()
                         }

--
Gitblit v1.9.3