From eddeff0b81ea84c3b66ab1b8b7943146f953b0e1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 13 二月 2023 17:17:05 +0800
Subject: [PATCH] 1.往来单位同步修改(客户、供应商、客户/供应商) 2.往来单位新增/编修 :单位属性改为(客户、供应商、客户/供应商) 3.生产开报工PC端、APP端:外协工序时外协供应商(供应商、客户/供应商) 4.委外工序明细报表:(供应商、客户/供应商) 5.工序定义关联工作站(供应商、客户/供应商) 6.综合看板右上角字段(供应商、客户/供应商) 7.采购订单看板(供应商、客户/供应商) 8.采购订单关闭接口开发

---
 VueWebApi/Tools/ImportExcelData.cs | 2121 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 1,903 insertions(+), 218 deletions(-)

diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index e932323..ce03a64 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -381,7 +381,7 @@
             else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+                Message = "浠撳簱娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
                 return Message;
             }
             else if (excelTable[0].Columns[1].ColumnName != "浠撳簱缂栧彿(鍞竴)")
@@ -568,62 +568,117 @@
         {
             string Message = "";
             code = "";
-            DataTable excelTable = new DataTable();
-            excelTable = ImportExcel.ExcelToTable(FileCode);
-            if (excelTable.Columns.Count != 10)
+            List<DataTable> excelTable = new List<DataTable>();
+            excelTable = ImportExcel.ExcelToThreeTableList(FileCode);
+            if (excelTable.Count != 6)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
             }
-            else if (excelTable.Columns[0].ColumnName != "搴忓彿")
+            else if (excelTable[0].Columns.Count != 4)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
             }
-            else if (excelTable.Columns[1].ColumnName != "璁惧缂栧彿(鍞竴)")
+            else if (excelTable[1].Columns.Count != 5)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧缁�)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
             }
-            else if (excelTable.Columns[2].ColumnName != "璁惧鍚嶇О")
+            else if (excelTable[2].Columns.Count != 9)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
             }
-            else if (excelTable.Columns[3].ColumnName != "璁惧绫诲瀷")
+            else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
             }
-            else if (excelTable.Columns[4].ColumnName != "鐢熶骇杞﹂棿")
+            else if (excelTable[0].Columns[1].ColumnName != "璁惧绫诲瀷缂栧彿(鍞竴)")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧绫诲瀷缂栧彿(鍞竴)}";
             }
-            else if (excelTable.Columns[5].ColumnName != "鎵�灞炰骇绾�")
+            else if (excelTable[0].Columns[2].ColumnName != "璁惧绫诲瀷鍚嶇О")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧绫诲瀷鍚嶇О}";
             }
-            else if (excelTable.Columns[6].ColumnName != "鎶曞叆鏃ユ湡")
+            else if (excelTable[0].Columns[3].ColumnName != "璁惧绫诲瀷鎻忚堪")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧绫诲瀷)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕璁惧绫诲瀷鎻忚堪}";
             }
-            else if (excelTable.Columns[7].ColumnName != "绋煎姩鐜囷紙%锛�")
+            else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
             }
-            else if (excelTable.Columns[8].ColumnName != "浣跨敤鐘舵��")
+            else if (excelTable[1].Columns[1].ColumnName != "璁惧缁勭紪鍙�(鍞竴)")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧缁勭紪鍙�(鍞竴)}";
             }
-            else if (excelTable.Columns[9].ColumnName != "鏁伴噰鏍囪瘑1")
+            else if (excelTable[1].Columns[2].ColumnName != "璁惧缁勫悕绉�")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧缁勫悕绉皚";
+            }
+            else if (excelTable[1].Columns[3].ColumnName != "璁惧绫诲瀷缂栧彿")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕璁惧绫诲瀷缂栧彿}";
+            }
+            else if (excelTable[1].Columns[4].ColumnName != "璁惧缁勬弿杩�")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧缁�)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕璁惧缁勬弿杩皚";
+            }
+            else if (excelTable[2].Columns[0].ColumnName != "搴忓彿")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+            }
+            else if (excelTable[2].Columns[1].ColumnName != "璁惧缂栧彿(鍞竴)")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕璁惧缂栧彿(鍞竴)}";
+            }
+            else if (excelTable[2].Columns[2].ColumnName != "璁惧鍚嶇О")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕璁惧鍚嶇О}";
+            }
+            else if (excelTable[2].Columns[3].ColumnName != "璁惧绫诲瀷缂栧彿")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕璁惧绫诲瀷缂栧彿}";
+            }
+            else if (excelTable[2].Columns[4].ColumnName != "璁惧缁勭紪鍙�")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕璁惧缁勭紪鍙穧";
+            }
+            else if (excelTable[2].Columns[5].ColumnName != "鎶曞叆鏃ユ湡")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕鎶曞叆鏃ユ湡}";
+            }
+            else if (excelTable[2].Columns[6].ColumnName != "鐢熶骇杞﹂棿")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕鐢熶骇杞﹂棿}";
+            }
+            else if (excelTable[2].Columns[7].ColumnName != "浣跨敤鐘舵��")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕浣跨敤鐘舵�亇";
+            }
+            else if (excelTable[2].Columns[8].ColumnName != "绋煎姩鐜囷紙%锛�")
+            {
+                code = "300";
+                Message = "璁惧娓呭崟妯℃澘(璁惧娓呭崟)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕绋煎姩鐜囷紙%锛墋";
             }
             else
             {
@@ -634,7 +689,7 @@
         }
         #endregion
 
-        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规妯℃澘銆�
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规椤圭洰妯℃澘銆�
         public static string Ten(string FileCode, out string code)
         {
             string Message = "";
@@ -644,82 +699,51 @@
             if (excelTable.Count != 2)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
             }
-            else if (excelTable[0].Columns.Count != 4)
+            else if (excelTable[0].Columns.Count != 6)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
-            }
-            else if (excelTable[1].Columns.Count != 9)
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
             }
             else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+                return Message;
             }
-            else if (excelTable[0].Columns[1].ColumnName != "鐐规鏍囧噯(鍞竴)")
+            else if (excelTable[0].Columns[1].ColumnName != "鐐规椤圭洰缂栧彿(鍞竴)")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕鐐规椤圭洰缂栧彿(鍞竴)}";
+                return Message;
             }
-            else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鍚嶇О锛堝敮涓�锛�")
+            else if (excelTable[0].Columns[2].ColumnName != "鐐规椤圭洰鍚嶇О")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕鐐规椤圭洰鍚嶇О}";
+                return Message;
             }
-            else if (excelTable[0].Columns[3].ColumnName != "鐐规绠℃帶")
+            else if (excelTable[0].Columns[3].ColumnName != "鐐规鍛ㄦ湡")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规鍛ㄦ湡}";
+                return Message;
             }
-            else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
+            else if (excelTable[0].Columns[4].ColumnName != "鏄惁鎵爜")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
+                return Message;
             }
-            else if (excelTable[1].Columns[1].ColumnName != "鐐规鏍囧噯")
+            else if (excelTable[0].Columns[5].ColumnName != "鐐规椤圭洰瑕佹眰")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[2].ColumnName != "鏍囧噯鍚嶇О")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[3].ColumnName != "SEQ(閮ㄤ綅椤哄簭)")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[4].ColumnName != "閮ㄤ綅鏉$爜锛堝敮涓�锛�")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[5].ColumnName != "閮ㄤ綅鍚嶇О")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[6].ColumnName != "鐐规瑕佹眰")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[7].ColumnName != "鏄惁鎵爜")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[8].ColumnName != "鐐规鍛ㄦ湡")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规椤圭洰瑕佹眰}";
+                return Message;
             }
             else
             {
@@ -730,7 +754,120 @@
         }
         #endregion
 
-        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧淇濆吇妯℃澘銆�
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规鏍囧噯妯℃澘銆�
+        public static string TwentyTwo(string FileCode, out string code)
+        {
+            string Message = "";
+            code = "";
+            List<DataTable> excelTable = new List<DataTable>();
+            excelTable = ImportExcel.ExcelToTableList(FileCode);
+            if (excelTable.Count != 4)
+            {
+                code = "300";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
+            }
+            else if (excelTable[0].Columns.Count != 5)
+            {
+                code = "300";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[1].Columns.Count != 8)
+            {
+                code = "300";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+            {
+                code = "300";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[1].ColumnName != "璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
+            {
+                code = "300";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[2].ColumnName != "璁惧鐐规鏍囧噯鍚嶇О")
+            {
+                code = "300";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧鐐规鏍囧噯鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[3].ColumnName != "鐐规绠℃帶")
+            {
+                code = "300";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鐐规绠℃帶}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[4].ColumnName != "鏍囧噯鎻忚堪")
+            {
+                code = "300";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鏍囧噯鎻忚堪}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
+            {
+                code = "300";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[1].ColumnName != "鐐规椤瑰簭鍙�")
+            {
+                code = "300";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐐规椤瑰簭鍙穧";
+                return Message;
+            }
+            else if (excelTable[1].Columns[2].ColumnName != "璁惧鐐规鏍囧噯缂栧彿")
+            {
+                code = "300";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧鐐规鏍囧噯缂栧彿}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[3].ColumnName != "璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)")
+            {
+                code = "300";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[4].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鍒楀簲涓簕閫夋嫨鎵爜}";
+                return Message;
+            }
+            else if (excelTable[1].Columns[7].ColumnName != "鐐规鍛ㄦ湡")
+            {
+                code = "300";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕鐐规鍛ㄦ湡}";
+                return Message;
+            }
+            else
+            {
+                code = "200";
+                Message = "妯℃澘妫�楠岄�氳繃";
+            }
+            return Message;
+        }
+        #endregion
+
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧淇濆吇椤圭洰妯℃澘銆�
         public static string Eleven(string FileCode, out string code)
         {
             string Message = "";
@@ -740,77 +877,152 @@
             if (excelTable.Count != 2)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
             }
-            else if (excelTable[0].Columns.Count != 3)
+            else if (excelTable[0].Columns.Count != 5)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
-            }
-            else if (excelTable[1].Columns.Count != 9)
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
             }
             else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+                return Message;
             }
-            else if (excelTable[0].Columns[1].ColumnName != "淇濆吇鏍囧噯(鍞竴)")
+            else if (excelTable[0].Columns[1].ColumnName != "淇濆吇椤圭洰缂栧彿(鍞竴)")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕淇濆吇椤圭洰缂栧彿(鍞竴)}";
+                return Message;
             }
-            else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鍚嶇О锛堝敮涓�锛�")
+            else if (excelTable[0].Columns[2].ColumnName != "淇濆吇椤圭洰鍚嶇О")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕淇濆吇椤圭洰鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[3].ColumnName != "鏄惁鎵爜")
+            {
+                code = "300";
+                Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[4].ColumnName != "淇濆吇椤圭洰瑕佹眰")
+            {
+                code = "300";
+                Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕淇濆吇椤圭洰瑕佹眰}";
+                return Message;
+            }
+            else
+            {
+                code = "200";
+                Message = "妯℃澘妫�楠岄�氳繃";
+            }
+            return Message;
+        }
+        #endregion
+
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧淇濆吇鏍囧噯妯℃澘銆�
+        public static string TwentyThree(string FileCode, out string code)
+        {
+            string Message = "";
+            code = "";
+            List<DataTable> excelTable = new List<DataTable>();
+            excelTable = ImportExcel.ExcelToTableList(FileCode);
+            if (excelTable.Count != 4)
+            {
+                code = "300";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
+            }
+            else if (excelTable[0].Columns.Count != 5)
+            {
+                code = "300";
+                Message = "璁惧淇濆吇鏍囧噯椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[1].Columns.Count != 7)
+            {
+                code = "300";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+            {
+                code = "300";
+                Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[1].ColumnName != "璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)")
+            {
+                code = "300";
+                Message = "璁惧淇濆吇鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[2].ColumnName != "璁惧淇濆吇鏍囧噯鍚嶇О")
+            {
+                code = "300";
+                Message = "璁惧淇濆吇鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧淇濆吇鏍囧噯鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[3].ColumnName != "淇濆吇鍛ㄦ湡")
+            {
+                code = "300";
+                Message = "璁惧淇濆吇鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕淇濆吇鍛ㄦ湡}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[4].ColumnName != "鏍囧噯鎻忚堪")
+            {
+                code = "300";
+                Message = "璁惧淇濆吇鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鏍囧噯鎻忚堪}";
+                return Message;
             }
             else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+                return Message;
             }
-            else if (excelTable[1].Columns[1].ColumnName != "淇濆吇鏍囧噯")
+            else if (excelTable[1].Columns[1].ColumnName != "淇濆吇椤瑰簭鍙�")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕淇濆吇椤瑰簭鍙穧";
+                return Message;
             }
-            else if (excelTable[1].Columns[2].ColumnName != "鏍囧噯鍚嶇О")
+            else if (excelTable[1].Columns[2].ColumnName != "璁惧淇濆吇鏍囧噯缂栧彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧淇濆吇鏍囧噯缂栧彿}";
+                return Message;
             }
-            else if (excelTable[1].Columns[3].ColumnName != "SEQ(閮ㄤ綅椤哄簭)")
+            else if (excelTable[1].Columns[3].ColumnName != "璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}";
+                return Message;
             }
-            else if (excelTable[1].Columns[4].ColumnName != "閮ㄤ綅鏉$爜锛堝敮涓�锛�")
+            else if (excelTable[1].Columns[4].ColumnName != "璁惧淇濆吇閮ㄤ綅鍚嶇О")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕璁惧淇濆吇閮ㄤ綅鍚嶇О}";
+                return Message;
             }
-            else if (excelTable[1].Columns[5].ColumnName != "閮ㄤ綅鍚嶇О")
+            else if (excelTable[1].Columns[5].ColumnName != "淇濆吇閮ㄤ綅瑕佹眰")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕淇濆吇閮ㄤ綅瑕佹眰}";
+                return Message;
             }
-            else if (excelTable[1].Columns[6].ColumnName != "淇濆吇瑕佹眰")
+            else if (excelTable[1].Columns[6].ColumnName != "閫夋嫨鎵爜")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[7].ColumnName != "鏄惁鎵爜")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[8].ColumnName != "淇濆吇鍛ㄦ湡")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕閫夋嫨鎵爜}";
+                return Message;
             }
             else
             {
@@ -1196,6 +1408,89 @@
         }
         #endregion
 
+        #region銆怑xcel妯℃澘涓婁紶楠岃瘉,鑺傛媿宸ヤ环妯℃澘銆�
+        public static string TwentyFour(string FileCode, out string code)
+        {
+            string Message = "";
+            code = "";
+            List<DataTable> excelTable = new List<DataTable>();
+            excelTable = ImportExcel.ExcelToTableList(FileCode);
+            if (excelTable.Count != 2)
+            {
+                code = "300";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
+            }
+            else if (excelTable[0].Columns.Count != 9)
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
+            }
+            else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[1].ColumnName != "浜у搧鍚嶇О")
+            {
+                code = "300";
+                Message = "浜у搧鍚嶇О妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕浜у搧鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[2].ColumnName != "宸ヨ壓璺嚎鍚嶇О")
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕宸ヨ壓璺嚎鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[3].ColumnName != "宸ュ簭鍚嶇О")
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕宸ュ簭鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[4].ColumnName != "璁惧鍚嶇О")
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕璁惧鍚嶇О}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[5].ColumnName != "璁′欢鍗曚环")
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕璁′欢鍗曚环}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[6].ColumnName != "璁惧鑺傛媿")
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕璁惧鑺傛媿}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[7].ColumnName != "鐢熶骇鑺傛媿")
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐢熶骇鑺傛媿}";
+                return Message;
+            }
+            else if (excelTable[0].Columns[8].ColumnName != "鍨嬭厰鏁�")
+            {
+                code = "300";
+                Message = "鑺傛媿宸ヤ环妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鍨嬭厰鏁皚";
+                return Message;
+            }
+            else
+            {
+                code = "200";
+                Message = "妯℃澘妫�楠岄�氳繃";
+            }
+            return Message;
+        }
+        #endregion
+
         #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璐ㄦ鏍囧噯妯℃澘銆�
         public static string Seventeen(string FileCode, out string code)
         {
@@ -1322,73 +1617,39 @@
             if (excelTable.Count != 2)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+                return Message;
+
             }
             else if (excelTable[0].Columns.Count != 4)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
-            }
-            else if (excelTable[1].Columns.Count != 7)
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                Message = "缂洪櫡瀹氫箟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                return Message;
             }
             else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "缂洪櫡瀹氫箟妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+                return Message;
             }
-            else if (excelTable[0].Columns[1].ColumnName != "鐗╂枡缂栫爜(鍞竴)")
+            else if (excelTable[0].Columns[1].ColumnName != "缂洪櫡缂栧彿(鍞竴)")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "缂洪櫡瀹氫箟妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕缂洪櫡缂栧彿(鍞竴)}";
+                return Message;
             }
-            else if (excelTable[0].Columns[2].ColumnName != "鐗╂枡鍚嶇О")
+            else if (excelTable[0].Columns[2].ColumnName != "缂洪櫡鍚嶇О")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "缂洪櫡瀹氫箟妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕缂洪櫡鍚嶇О}";
+                return Message;
             }
-            else if (excelTable[0].Columns[3].ColumnName != "鍚敤鐘舵��")
+            else if (excelTable[0].Columns[3].ColumnName != "缂洪櫡鎻忚堪")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-
-            else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[1].ColumnName != "鐗╂枡淇℃伅搴忓彿")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[2].ColumnName != "缂洪櫡浠g爜锛堝敮涓�锛�")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[3].ColumnName != "缂洪櫡鍚嶇О")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[4].ColumnName != "涓诲伐鑹鸿矾绾�")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[5].ColumnName != "璐d换宸ュ簭缂栫爜")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
-            }
-            else if (excelTable[1].Columns[6].ColumnName != "璐d换宸ュ簭鍚嶇О")
-            {
-                code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "缂洪櫡鎻忚堪妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕缂洪櫡鎻忚堪}";
+                return Message;
             }
             else
             {
@@ -1533,90 +1794,100 @@
             code = "";
             List<DataTable> excelTable = new List<DataTable>();
             excelTable = ImportExcel.ExcelToTableList(FileCode);
-            if (excelTable.Count != 2)
+            if (excelTable.Count != 4)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+                Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
             }
             else if (excelTable[0].Columns.Count != 6)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢淇℃伅)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
             }
-            else if (excelTable[1].Columns.Count != 8)
+            else if (excelTable[1].Columns.Count != 10)
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢淇℃伅)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
             }
             else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
             }
             else if (excelTable[0].Columns[1].ColumnName != "姣嶄欢缂栫爜")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕姣嶄欢缂栫爜}";
             }
             else if (excelTable[0].Columns[2].ColumnName != "姣嶄欢鍚嶇О")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕姣嶄欢鍚嶇О}";
             }
             else if (excelTable[0].Columns[3].ColumnName != "鍩虹鏁伴噺")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鍩虹鏁伴噺}";
             }
             else if (excelTable[0].Columns[4].ColumnName != "鍚敤鐘舵��")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鍚敤鐘舵�亇";
             }
             else if (excelTable[0].Columns[5].ColumnName != "鐗堟湰鍙�")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鐗堟湰鍙穧";
             }
             else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
             }
             else if (excelTable[1].Columns[1].ColumnName != "涓昏〃搴忓垪鍙�")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕涓昏〃搴忓垪鍙穧";
             }
-            else if (excelTable[1].Columns[2].ColumnName != "瀛愪欢缂栫爜")
+            else if (excelTable[1].Columns[2].ColumnName != "瀛愪欢椤哄簭鍙�")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瀛愪欢椤哄簭鍙穧";
             }
-            else if (excelTable[1].Columns[3].ColumnName != "瀛愪欢鍚嶇О")
+            else if (excelTable[1].Columns[3].ColumnName != "瀛愪欢缂栫爜")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕瀛愪欢缂栫爜}";
             }
-            else if (excelTable[1].Columns[4].ColumnName != "鍙戞枡浠撳簱")
+            else if (excelTable[1].Columns[4].ColumnName != "瀛愪欢鍚嶇О")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕瀛愪欢鍚嶇О}";
             }
-            else if (excelTable[1].Columns[5].ColumnName != "鍩烘湰鐢ㄩ噺")
+            else if (excelTable[1].Columns[5].ColumnName != "鍙戞枡浠撳簱")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鍙戞枡浠撳簱}";
             }
-            else if (excelTable[1].Columns[6].ColumnName != "鎹熻�楃巼(%)")
+            else if (excelTable[1].Columns[6].ColumnName != "鍩烘湰鐢ㄩ噺")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕鍩烘湰鐢ㄩ噺}";
             }
-            else if (excelTable[1].Columns[7].ColumnName != "灞炴��")
+            else if (excelTable[1].Columns[7].ColumnName != "鎹熻�楃巼(%)")
             {
                 code = "300";
-                Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕鎹熻�楃巼(%)}";
+            }
+            else if (excelTable[1].Columns[8].ColumnName != "瀹為檯鐢ㄩ噺")
+            {
+                code = "300";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�9鍒楀簲涓簕瀹為檯鐢ㄩ噺}";
+            }
+            else if (excelTable[1].Columns[9].ColumnName != "灞炴��")
+            {
+                code = "300";
+                Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢)锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�10鍒楀簲涓簕灞炴�";
             }
             else
             {
@@ -2003,14 +2274,132 @@
             StuCode = "";
             count = 0;
             string sql = "";
+            var dynamicParams = new DynamicParameters();
             DataTable dt;
             List<ExcelErro> list = new List<ExcelErro>();
-
+            List<DataTable> excelTable = new List<DataTable>();
+            list = ImportExcel.ExcelToThreeTableListErro(FileCode);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            excelTable = ImportExcel.ExcelToThreeTableList(FileCode);  //鑾峰彇Excel鏁版嵁
+            //璁惧绫诲瀷琛�,鍒ゆ柇璁惧绫诲瀷鏄惁瀛樺湪
+            for (int i = 0; i < excelTable[0].Rows.Count; i++)
+            {
+                if (excelTable[0].Rows[i][1].ToString().Trim() != null && excelTable[0].Rows[i][1].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TEqpType where code=@code";
+                    dynamicParams.Add("@code", excelTable[0].Rows[i][1].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{璁惧绫诲瀷缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧绫诲瀷琛�:{璁惧绫诲瀷缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[i][1].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //璁惧缁勮〃,鍒ゆ柇璁惧缁勬槸鍚﹀瓨鍦�
+            for (int j = 0; j < excelTable[1].Rows.Count; j++)
+            {
+                if (excelTable[1].Rows[j][1].ToString().Trim() != null && excelTable[1].Rows[j][1].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TEqpGroup where code=@code";
+                    dynamicParams.Add("@code", excelTable[1].Rows[j][1].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{璁惧缁勭紪鍙�(鍞竴)}";
+                        erro.ErrorCont = "璁惧缁勮〃:{璁惧缁勭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[j][1].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+            var dt3 = from r in excelTable[1].AsEnumerable()
+                      where !(
+                          from rr in excelTable[0].AsEnumerable()
+                          select rr.Field<string>("璁惧绫诲瀷缂栧彿(鍞竴)")
+                      ).Contains(r.Field<string>("璁惧绫诲瀷缂栧彿"))
+                      select r;
+            List<DataRow> listRow = dt3.ToList();
+            if (listRow.Count > 0)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{璁惧绫诲瀷缂栧彿}";
+                erro.ErrorCont = "璁惧缁勪俊鎭�:{璁惧绫诲瀷缂栧彿}瀛楁涓湁鍊煎湪璁惧绫诲瀷淇℃伅:{璁惧绫诲瀷缂栧彿(鍞竴)}涓笉瀛樺湪";
+                list.Add(erro);
+            }
+            //璁惧娓呭崟琛�
+            for (int k = 0; k < excelTable[2].Rows.Count; k++)
+            {
+                if (excelTable[2].Rows[k][1].ToString().Trim() != null && excelTable[2].Rows[k][1].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TEqpInfo where code=@code";
+                    dynamicParams.Add("@code", excelTable[2].Rows[k][1].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{璁惧缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧琛�:{璁惧缂栧彿(鍞竴)}瀛楁" + excelTable[2].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                    //鍒ゆ柇璁惧缁勬槸鍚﹀搴旀纭殑璁惧绫诲瀷
+                    var yourGetData = excelTable[1].AsEnumerable().Where<DataRow>(a => a["璁惧绫诲瀷缂栧彿"].ToString() == excelTable[2].Rows[k][3].ToString().Trim()&& a["璁惧缁勭紪鍙�(鍞竴)"].ToString() == excelTable[2].Rows[k][4].ToString().Trim());
+                    if (yourGetData.Count() <= 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{璁惧绫诲瀷缂栧彿}/{璁惧缁勭紪鍙穧";
+                        erro.ErrorCont = "璁惧琛�:{璁惧缂栧彿(鍞竴)}瀛楁" + excelTable[2].Rows[k][1].ToString().Trim() + "瀵瑰簲{璁惧绫诲瀷缂栧彿}:"+ excelTable[2].Rows[k][4].ToString().Trim() + "/{璁惧缁勭紪鍙穧:"+ excelTable[2].Rows[k][4].ToString().Trim() + "涓庤澶囩粍娓呭崟涓缃涓嶄笂";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //杞﹂棿鍒ゆ柇
+            for (int m = 0; m < excelTable[2].Rows.Count; m++)
+            {
+                if (excelTable[2].Rows[m][6].ToString().Trim() != null && excelTable[2].Rows[m][6].ToString().Trim() != "")
+                {
+                    sql = @"select *  from TOrganization where org_name=@code and description='W'";
+                    dynamicParams.Add("@code", excelTable[2].Rows[m][6].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count<=0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{鐢熶骇杞﹂棿}";
+                        erro.ErrorCont = "璁惧琛�:{鐢熶骇杞﹂棿}瀛楁" + excelTable[2].Rows[m][6].ToString().Trim() + "涓嶅瓨鍦�";
+                        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+excelTable[2].Rows.Count;
+            }
             return list;
         }
         #endregion
 
-        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧鐐规銆�
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧鐐规椤圭洰銆�
         public static List<ExcelErro> TenData(string FileCode, out string StuCode, out string message, out int count)
         {
 
@@ -2019,13 +2408,181 @@
             count = 0;
             string sql = "";
             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鏁版嵁
+            //褰撳墠Excel鏁版嵁涓偣妫�鏍囧噯椤电涓�,璁惧鐐规鏍囧噯缂栧彿(鍞竴鏄惁鏈夐噸澶�)
+            DataTable distinct = excelTable.DefaultView.ToTable(true, "鐐规椤圭洰缂栧彿(鍞竴)");
+            if (distinct.Rows.Count != excelTable.Rows.Count)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{鐐规椤圭洰缂栧彿(鍞竴)}";
+                erro.ErrorCont = "璁惧鐐规椤圭洰椤电妯℃澘:{鐐规椤圭洰缂栧彿(鍞竴)}鏈夐噸澶�";
+                list.Add(erro);
+            }
+            for (int i = 0; i < excelTable.Rows.Count; i++)
+            {
+                if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
+                {
+                    sql = @"select code  from TEqpchk_Item where code=@code";
 
+                    dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{鐐规椤圭洰缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧鐐规椤圭洰琛�:{鐐规椤圭洰缂栧彿(鍞竴)}瀛楁" + excelTable.Rows[i][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.Rows.Count;
+            }
             return list;
         }
         #endregion
 
-        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧淇濆吇銆�
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧鐐规鏍囧噯銆�
+        public static List<ExcelErro> TwentyTwoData(string FileCode, 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<DataTable> excelTable = new List<DataTable>();
+            list = ImportExcel.ExcelToTableListErro(FileCode);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            excelTable = ImportExcel.ExcelToTableList(FileCode);  //鑾峰彇Excel鏁版嵁
+            //褰撳墠Excel鏁版嵁涓偣妫�鏍囧噯椤电涓�,璁惧鐐规鏍囧噯缂栧彿(鍞竴鏄惁鏈夐噸澶�)
+            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 = "璁惧鐐规鏍囧噯椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}鏈夐噸澶�";
+                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() != "")
+                {
+                    sql = @"select *  from TEqpchk_Main where code=@code";
+                    dynamicParams.Add("@code", excelTable[0].Rows[j][1].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧鐐规鏍囧噯琛�:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][1].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+                        list.Add(erro);
+                    }
+                    //閫氳繃璁惧鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ璁惧鐐规閮ㄤ綅椤电妯℃澘涓搴旂殑鏁版嵁淇℃伅
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["璁惧鐐规鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][1].ToString().Trim());
+                    DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
+                    if (ds.Rows.Count > 0)
+                    {
+                        //鍒ゆ柇淇濆吇鏍囧噯鏌ヨ淇濆吇閮ㄤ綅鏁版嵁鏄惁鏈夐噸澶�
+                        DataTable distinct1 = ds.DefaultView.ToTable(true, "璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)");
+                        if (distinct1.Rows.Count != ds.Rows.Count)
+                        {
+                            ExcelErro erro = new ExcelErro();
+                            erro.RoeNumber = "/";
+                            erro.ErrorField = "{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+                            erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 瀵瑰簲{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
+                            list.Add(erro);
+                        }
+                    }
+                    else
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 鍦ㄨ澶囩偣妫�鏍囧噯椤电妯℃澘涓笉瀛樺湪";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //褰撳墠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() != "")
+                {
+                    sql = @"select *  from TEqpchk_Item where code=@code";
+                    dynamicParams.Add("@code", 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() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+            var dt3 = from r in excelTable[1].AsEnumerable()
+                      where !(
+                          from rr in excelTable[0].AsEnumerable()
+                          select rr.Field<string>("璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
+                      ).Contains(r.Field<string>("璁惧鐐规鏍囧噯缂栧彿"))
+                      select r;
+            List<DataRow> listRow = dt3.ToList();
+            if (listRow.Count > 0)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿}";
+                erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                list.Add(erro);
+            }
+            if (list.Count > 0)
+            {
+                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> ElevenData(string FileCode, out string StuCode, out string message, out int count)
         {
             message = "";
@@ -2033,8 +2590,176 @@
             count = 0;
             string sql = "";
             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鏁版嵁
+            //褰撳墠Excel鏁版嵁涓偣妫�鏍囧噯椤电涓�,璁惧鐐规鏍囧噯缂栧彿(鍞竴鏄惁鏈夐噸澶�)
+            DataTable distinct = excelTable.DefaultView.ToTable(true, "淇濆吇椤圭洰缂栧彿(鍞竴)");
+            if (distinct.Rows.Count != excelTable.Rows.Count)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{淇濆吇椤圭洰缂栧彿(鍞竴)}";
+                erro.ErrorCont = "璁惧淇濆吇椤圭洰椤电妯℃澘:{淇濆吇椤圭洰缂栧彿(鍞竴)}鏈夐噸澶�";
+                list.Add(erro);
+            }
+            for (int i = 0; i < excelTable.Rows.Count; i++)
+            {
+                if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
+                {
+                    sql = @"select code  from TEqpmai_Item where code=@code";
 
+                    dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{淇濆吇椤圭洰缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧淇濆吇椤圭洰琛�:{鐐规淇濆吇缂栧彿(鍞竴)}瀛楁" + excelTable.Rows[i][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.Rows.Count;
+            }
+            return list;
+        }
+        #endregion
+
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧淇濆吇鏍囧噯銆�
+        public static List<ExcelErro> TwentyThreeData(string FileCode, 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<DataTable> excelTable = new List<DataTable>();
+            list = ImportExcel.ExcelToTableListErro(FileCode);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            excelTable = ImportExcel.ExcelToTableList(FileCode);  //鑾峰彇Excel鏁版嵁
+            //褰撳墠Excel鏁版嵁涓繚鍏绘爣鍑嗛〉绛句腑,璁惧淇濆吇鏍囧噯缂栧彿(鍞竴鏄惁鏈夐噸澶�)
+            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 = "璁惧淇濆吇鏍囧噯椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}鏈夐噸澶�";
+                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() != "")
+                {
+                    sql = @"select *  from TEqpmai_Main where code=@code";
+                    dynamicParams.Add("@code", excelTable[0].Rows[j][1].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧淇濆吇鏍囧噯琛�:{璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][1].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+                        list.Add(erro);
+                    }
+                    //閫氳繃璁惧淇濆吇鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ璁惧淇濆吇閮ㄤ綅椤电妯℃澘涓搴旂殑鏁版嵁淇℃伅
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["璁惧淇濆吇鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][1].ToString().Trim());
+                    DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
+                    if (ds.Rows.Count > 0)
+                    {
+                        //鍒ゆ柇淇濆吇鏍囧噯鏌ヨ淇濆吇閮ㄤ綅鏁版嵁鏄惁鏈夐噸澶�
+                        DataTable distinct1 = ds.DefaultView.ToTable(true, "璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)");
+                        if (distinct1.Rows.Count != ds.Rows.Count)
+                        {
+                            ExcelErro erro = new ExcelErro();
+                            erro.RoeNumber = "/";
+                            erro.ErrorField = "{璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}";
+                            erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 瀵瑰簲{璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
+                            list.Add(erro);
+                        }
+                    }
+                    else 
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][2].ToString().Trim() + " 鍦ㄨ澶囦繚鍏绘爣鍑嗛〉绛炬ā鏉夸腑涓嶅瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //褰撳墠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() != "")
+                {
+                    sql = @"select *  from TEqpmai_Item where code=@code";
+                    dynamicParams.Add("@code", 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() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+            var dt3 = from r in excelTable[1].AsEnumerable()
+                      where !(
+                          from rr in excelTable[0].AsEnumerable()
+                          select rr.Field<string>("璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)")
+                      ).Contains(r.Field<string>("璁惧淇濆吇鏍囧噯缂栧彿"))
+                      select r;
+            List<DataRow> listRow = dt3.ToList();
+            if (listRow.Count > 0)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{璁惧淇濆吇鏍囧噯缂栧彿}";
+                erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧淇濆吇鏍囧噯椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                list.Add(erro);
+            }
+            if (list.Count > 0)
+            {
+                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
@@ -2109,6 +2834,143 @@
         }
         #endregion
 
+        #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,鑺傛媿宸ヤ环銆�
+        public static List<ExcelErro> TwentyFourData(string FileCode, out string StuCode, out string message, out int count)
+        {
+            message = "";
+            StuCode = "";
+            count = 0;
+            string sql = "";
+            DataTable dt;
+            var dynamicParams = new DynamicParameters();
+            List<ExcelErro> list = new List<ExcelErro>();
+            DataTable excelTable = new DataTable();
+            list = ImportExcel.ExcelToTableErro(FileCode);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            excelTable = ImportExcel.ExcelToTable(FileCode);  //鑾峰彇Excel鏁版嵁
+            for (int i = 0; i < excelTable.Rows.Count; i++)
+            {
+                //浜у搧鏄惁瀛樺湪
+                sql = @"select partname from TMateriel_Info 
+                        where partname=@partname";
+                dynamicParams.Add("@partname", excelTable.Rows[i][1].ToString().Trim());
+                var data = DapperHelper.selectdata(sql, dynamicParams);
+                if (data.Rows.Count <= 0)
+                {
+                    ExcelErro erro = new ExcelErro();
+                    erro.RoeNumber = "/";
+                    erro.ErrorField = "{浜у搧鍚嶇О}";
+                    erro.ErrorCont = "瀛樿揣妗f:{浜у搧鍚嶇О}瀛楁" + excelTable.Rows[i][1].ToString().Trim() + "涓嶅瓨鍦�";
+                    list.Add(erro);
+                }
+                //宸ヨ壓璺嚎鏄惁瀛樺湪
+                sql = @"select name from TFlw_Rout 
+                        where name=@routename";
+                dynamicParams.Add("@routename", excelTable.Rows[i][2].ToString().Trim());
+                var data0 = DapperHelper.selectdata(sql, dynamicParams);
+                if (data0.Rows.Count <= 0)
+                {
+                    ExcelErro erro = new ExcelErro();
+                    erro.RoeNumber = "/";
+                    erro.ErrorField = "{宸ヨ壓璺嚎鍚嶇О}";
+                    erro.ErrorCont = "宸ヨ壓璺嚎:{宸ヨ壓璺嚎鍚嶇О}瀛楁" + excelTable.Rows[i][2].ToString().Trim() + "涓嶅瓨鍦�";
+                    list.Add(erro);
+                }
+                //宸ュ簭鏄惁瀛樺湪
+                sql = @"select stepname from TStep 
+                        where stepname=@stepname";
+                dynamicParams.Add("@stepname", excelTable.Rows[i][3].ToString().Trim());
+                var data1 = DapperHelper.selectdata(sql, dynamicParams);
+                if (data1.Rows.Count <= 0)
+                {
+                    ExcelErro erro = new ExcelErro();
+                    erro.RoeNumber = "/";
+                    erro.ErrorField = "{宸ュ簭鍚嶇О}";
+                    erro.ErrorCont = "宸ュ簭瀹氫箟:{宸ュ簭鍚嶇О}瀛楁" + excelTable.Rows[i][3].ToString().Trim() + "涓嶅瓨鍦�";
+                    list.Add(erro);
+                }
+                //璁惧鏄惁瀛樺湪
+                sql = @"select name from TEqpInfo 
+                        where name=@eqpname";
+                dynamicParams.Add("@eqpname", excelTable.Rows[i][4].ToString().Trim());
+                var data2 = DapperHelper.selectdata(sql, dynamicParams);
+                if (data2.Rows.Count <= 0)
+                {
+                    ExcelErro erro = new ExcelErro();
+                    erro.RoeNumber = "/";
+                    erro.ErrorField = "{璁惧鍚嶇О}";
+                    erro.ErrorCont = "璁惧娓呭崟:{璁惧鍚嶇О}瀛楁" + excelTable.Rows[i][4].ToString().Trim() + "涓嶅瓨鍦�";
+                    list.Add(erro);
+                }
+                //鍒ゆ柇浜у搧鏄惁鍏宠仈宸ヨ壓璺嚎
+                sql = @"select M.partname,R.name  from TMateriel_Route A
+                        inner join TMateriel_Info M on A.materiel_code=M.partcode
+                        inner join TFlw_Rout R on A.route_code=R.code
+                        where M.partname=@partname and R.name=@routename";
+                dynamicParams.Add("@partname", excelTable.Rows[i][1].ToString().Trim());
+                dynamicParams.Add("@routename", excelTable.Rows[i][2].ToString().Trim());
+                var data3 = DapperHelper.selectdata(sql, dynamicParams);
+                if (data3.Rows.Count <= 0)
+                {
+                    ExcelErro erro = new ExcelErro();
+                    erro.RoeNumber = "/";
+                    erro.ErrorField = "{浜у搧鍚嶇О/宸ヨ壓璺嚎鍚嶇О}";
+                    erro.ErrorCont = "浜у搧鍏宠仈宸ヨ壓璺嚎:{浜у搧鍚嶇О}瀛楁:銆�" + excelTable.Rows[i][1].ToString().Trim() + "銆戝搴斿伐鑹鸿矾绾垮悕绉帮細銆�" + excelTable.Rows[i][2].ToString().Trim() + "銆戞湭鍏宠仈";
+                    list.Add(erro);
+                }
+                //鍒ゆ柇宸ヨ壓璺嚎鏄惁鍏宠仈宸ュ簭
+                sql = @"select R.name,S.stepname  from TFlw_Rtdt A
+                        inner join TFlw_Rout R on A.rout_code=R.code
+                        inner join TStep S on A.step_code=S.stepcode
+                        where R.name=@routename and S.stepname=@stepname";
+                dynamicParams.Add("@routename", excelTable.Rows[i][2].ToString().Trim());
+                dynamicParams.Add("@stepname", excelTable.Rows[i][3].ToString().Trim());
+                var data4 = DapperHelper.selectdata(sql, dynamicParams);
+                if (data4.Rows.Count <= 0)
+                {
+                    ExcelErro erro = new ExcelErro();
+                    erro.RoeNumber = "/";
+                    erro.ErrorField = "{宸ヨ壓璺嚎鍚嶇О/宸ュ簭鍚嶇О}";
+                    erro.ErrorCont = "宸ヨ壓璺嚎鍏宠仈宸ュ簭:{宸ヨ壓璺嚎鍚嶇О}瀛楁:銆�" + excelTable.Rows[i][2].ToString().Trim() + "銆戝搴斿伐搴忓悕绉帮細銆�" + excelTable.Rows[i][3].ToString().Trim() + "銆戞湭鍏宠仈";
+                    list.Add(erro);
+                }
+                //鍒ゆ柇宸ュ簭鏄惁鍏宠仈璁惧
+                sql = @"select E.name,S.stepname  from TFlw_Rteqp A
+                        inner join TStep S on A.step_code=S.stepcode
+                        inner join TEqpInfo E on A.eqp_code=E.code
+                        where S.stepname=@stepname and E.name=@eqpname";
+                dynamicParams.Add("@stepname", excelTable.Rows[i][3].ToString().Trim());
+                dynamicParams.Add("@eqpname", excelTable.Rows[i][4].ToString().Trim());
+                var data5 = DapperHelper.selectdata(sql, dynamicParams);
+                if (data5.Rows.Count <= 0)
+                {
+                    ExcelErro erro = new ExcelErro();
+                    erro.RoeNumber = "/";
+                    erro.ErrorField = "{宸ュ簭鍚嶇О/璁惧鍚嶇О}";
+                    erro.ErrorCont = "宸ュ簭鍏宠仈璁惧:{宸ュ簭鍚嶇О}瀛楁:銆�" + excelTable.Rows[i][3].ToString().Trim() + "銆戝搴旇澶囧悕绉帮細銆�" + excelTable.Rows[i][4].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.Rows.Count;
+            }
+            return list;
+        }
+        #endregion
+
         #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璐ㄦ鏍囧噯銆�
         public static List<ExcelErro> SeventeenData(string FileCode, out string StuCode, out string message, out int count)
         {
@@ -2131,8 +2993,46 @@
             count = 0;
             string sql = "";
             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鏁版嵁
+            for (int i = 0; i < excelTable.Rows.Count; i++)
+            {
+                if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
+                {
+                    sql = @"select code  from TDefect where code=@code";
 
+                    dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{缂洪櫡瀹氫箟缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "缂洪櫡瀹氫箟琛�:{缂洪櫡瀹氫箟缂栧彿(鍞竴)}瀛楁" + excelTable.Rows[i][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.Rows.Count;
+            }
             return list;
         }
         #endregion
@@ -2207,9 +3107,129 @@
             StuCode = "";
             count = 0;
             string sql = "";
-            DataTable dt;
+            var dynamicParams = new DynamicParameters();
+            DataTable dt0,dt;
             List<ExcelErro> list = new List<ExcelErro>();
+            List<DataTable> excelTable = new List<DataTable>();
+            list = ImportExcel.ExcelToTableListErro(FileCode);    //楠岃瘉Excel鏁版嵁蹇呭~瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+            excelTable = ImportExcel.ExcelToTableList(FileCode);  //鑾峰彇Excel鏁版嵁
+            //Excel鏌ヨ姣嶄欢+鐗堟湰鍙锋槸鍚﹂噸澶�
+            DataTable distinct = excelTable[0].DefaultView.ToTable(true, new string[] {"姣嶄欢缂栫爜", "鐗堟湰鍙�" });
+            if (distinct.Rows.Count != excelTable[0].Rows.Count)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{鐗堟湰鍙穧";
+                erro.ErrorCont = "Bom姣嶄欢琛�:{姣嶄欢缂栫爜}瀵瑰簲鐨剓鐗堟湰鍙穧鏈夐噸澶�";
+                list.Add(erro);
+            }
+            //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+            var dt3 = from r in excelTable[1].AsEnumerable()
+                      where !(
+                          from rr in excelTable[0].AsEnumerable()
+                          select rr.Field<string>("搴忓彿")
+                      ).Contains(r.Field<string>("涓昏〃搴忓垪鍙�"))
+                      select r;
+            List<DataRow> listRow = dt3.ToList();
+            if (listRow.Count > 0)
+            {
+                ExcelErro erro = new ExcelErro();
+                erro.RoeNumber = "/";
+                erro.ErrorField = "{涓昏〃搴忓垪鍙穧";
+                erro.ErrorCont = "瀛愪欢淇℃伅:{涓昏〃搴忓垪鍙穧瀛楁涓湁鍊煎湪姣嶄欢淇℃伅:{搴忓彿}涓笉瀛樺湪";
+                list.Add(erro);
+            }
+            //鏁版嵁搴撴煡璇㈡瘝浠�+鐗堟湰鍙锋槸鍚﹀瓨鍦�
+            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() != "")
+                {
+                    //鍒ゆ柇姣嶄欢鍦ㄥ瓨璐т腑鏄惁瀛樺湪
+                    sql = @"select *  from TMateriel_Info where partcode=@partcode";
+                    dynamicParams.Add("@partcode", excelTable[0].Rows[j][1].ToString().Trim());
+                    dt0 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt0.Rows.Count<=0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{姣嶄欢缂栫爜}";
+                        erro.ErrorCont = "Bom姣嶄欢琛�:{姣嶄欢缂栫爜}瀛楁" + excelTable[0].Rows[j][1].ToString().Trim() + "鍦ㄥ瓨璐ф。妗堜腑涓嶅瓨鍦�";
+                        list.Add(erro);
+                    }
 
+                    sql = @"select *  from TBom_Main where materiel_code=@code and version=@version";
+                    dynamicParams.Add("@code", excelTable[0].Rows[j][1].ToString().Trim());
+                    dynamicParams.Add("@version", excelTable[0].Rows[j][5].ToString().Trim());
+                    dt = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt.Rows.Count > 0)
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{姣嶄欢缂栫爜}";
+                        erro.ErrorCont = "Bom姣嶄欢琛�:{姣嶄欢缂栫爜}瀛楁" + excelTable[0].Rows[j][1].ToString().Trim() + "瀵瑰簲鐨勭増鏈彿:" + excelTable[0].Rows[j][5].ToString() + "宸插瓨鍦�";
+                        list.Add(erro);
+                    }
+                    //鏌ヨ姣嶄欢淇℃伅瀵瑰簲鐨勫瓙浠朵俊鎭�
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["涓昏〃搴忓垪鍙�"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+                    DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
+                    if (ds.Rows.Count > 0)
+                    {
+                        //鍒ゆ柇鍚屾瘝浠跺搴旂殑瀛愪欢鏄惁閲嶅
+                        DataTable distinct1 = ds.DefaultView.ToTable(true, "瀛愪欢缂栫爜");
+                        if (distinct1.Rows.Count != ds.Rows.Count)
+                        {
+                            ExcelErro erro = new ExcelErro();
+                            erro.RoeNumber = "/";
+                            erro.ErrorField = "{瀛愪欢缂栫爜}";
+                            erro.ErrorCont = "鐗╂枡娓呭崟瀵瑰簲瀛愪欢淇℃伅椤电妯℃澘:涓昏〃搴忓垪鍙凤細銆�" + excelTable[1].Rows[j]["涓昏〃搴忓垪鍙�"].ToString() + "銆戝搴攞瀛愪欢缂栫爜}鏈夐噸澶�";
+                            list.Add(erro);
+                        }
+                    }
+                    else
+                    {
+                        ExcelErro erro = new ExcelErro();
+                        erro.RoeNumber = "/";
+                        erro.ErrorField = "{涓昏〃搴忓垪鍙穧";
+                        erro.ErrorCont = "鐗╂枡娓呭崟瀵瑰簲瀛愪欢淇℃伅椤电妯℃澘:{涓昏〃搴忓垪鍙穧:" + excelTable[1].Rows[j][1].ToString().Trim() + " 鍦ㄦ瘝浠朵俊鎭〉绛炬ā鏉夸腑涓嶅瓨鍦�";
+                        list.Add(erro);
+                    }
+                }
+            }
+            //瀛愪欢鍒ゆ柇
+            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() != "")
+                {
+                    sql = @"select *  from TMateriel_Info where partcode=@partcode";
+                    dynamicParams.Add("@partcode", 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][3].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 + excelTable[1].Rows.Count;
+            }
             return list;
         }
         #endregion
@@ -2314,7 +3334,7 @@
         }
         #endregion
 
-        #region[Excel鏁版嵁涓婁紶,瑙掕壊鏉冮檺]
+        #region銆怑xcel鏁版嵁涓婁紶,瑙掕壊鏉冮檺銆�
         public static string OneSubmit(string FileCode, string User, out string StuCode)
         {
             string message = "";
@@ -2419,24 +3439,24 @@
                 //瀵煎叆寰�鏉ュ崟浣嶈〃
                 for (int i = 0; i < excelTable.Rows.Count; i++)
                 {
-                    string WGType = "", WXType = "", KHType = "";
+                    string Type = "";
                     switch (excelTable.Rows[i][3].ToString().Trim())
                     {
-                        case "澶栬喘渚涙柟":
-                            WGType = "WG";
-                            break;
-                        case "澶栧崗渚涙柟":
-                            WXType = "WX";
+                        case "渚涘簲鍟�":
+                            Type = "226";
                             break;
                         case "瀹㈡埛":
-                            KHType = "KH";
+                            Type = "211";
+                            break;
+                        case "瀹㈡埛/渚涘簲鍟�":
+                            Type = "228";
                             break;
                         default:
                             break;
                     }
 
-                    sql = @"insert into TCustomer(code,name,mtype,conttacts,conttphone,addr,lm_user,lm_date,btype,htype) 
-                            values(@code,@name,@mtype,@conttacts,@conttphone,@addr,@Operator,@CreateDate,@btype,@htype)";
+                    sql = @"insert into TCustomer(code,name,type,conttacts,conttphone,addr,lm_user,lm_date) 
+                            values(@code,@name,@type,@conttacts,@conttphone,@addr,@Operator,@CreateDate)";
                     list.Add(new
                     {
                         str = sql,
@@ -2444,14 +3464,12 @@
                         {
                             code = excelTable.Rows[i][1].ToString().Trim(),
                             name = excelTable.Rows[i][2].ToString().Trim(),
-                            mtype = WGType,
+                            type = Type,
                             conttacts = excelTable.Rows[i][4].ToString().Trim(),
                             conttphone = excelTable.Rows[i][5].ToString().Trim(),
                             addr = excelTable.Rows[i][6].ToString().Trim(),
                             Operator = User,
-                            CreateDate = DateTime.Now.ToString(),
-                            btype = WXType,
-                            htype = KHType
+                            CreateDate = DateTime.Now.ToString()
                         }
                     });
                 }
@@ -2586,11 +3604,95 @@
         #region銆怑xcel鏁版嵁涓婁紶,璁惧娓呭崟銆�
         public static string NineSubmit(string FileCode, string User, out string StuCode)
         {
-            string message = "";
-            StuCode = "";
+            string message = ""; StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
+                list.Clear();
+                List<DataTable> excelTable = new List<DataTable>();
+                excelTable = ImportExcel.ExcelToThreeTableList(FileCode);
+                //鍐欏叆璁惧绫诲瀷
+                for (int i = 0; i < excelTable[0].Rows.Count; i++)
+                {
+                    sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark) 
+                            values(@code,@name,@lm_user,@lm_date,@remark)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable[0].Rows[i][1].ToString().Trim(),
+                            name = excelTable[0].Rows[i][2].ToString().Trim(),
+                            lm_user = User,
+                            lm_date = DateTime.Now.ToString(),
+                            remark= excelTable[0].Rows[i][3].ToString().Trim()
 
+                        }
+                    });
+                }
+                //鍐欏叆璁惧缁�
+                for (int j = 0; j < excelTable[1].Rows.Count; j++)
+                {
+                    sql = @"insert into TEqpGroup(code,name,lm_user,lm_date,remark,eqptype_code) 
+                            values(@code,@name,@lm_user,@lm_date,@remark,@eqptype_code)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable[1].Rows[j][1].ToString().Trim(),
+                            name = excelTable[1].Rows[j][2].ToString().Trim(),
+                            lm_user = User,
+                            lm_date = DateTime.Now.ToString(),
+                            remark = excelTable[1].Rows[j][4].ToString().Trim(),
+                            eqptype_code= excelTable[1].Rows[j][3].ToString().Trim()
+
+                        }
+                    });
+                }
+                //瀵煎叆璁惧娓呭崟
+                for (int k = 0; k < excelTable[2].Rows.Count; k++)
+                {
+                    //鑾峰彇杞﹂棿缂栫爜
+                    string sql0 = @"select org_code,org_name from TOrganization where org_name=@wkshp and description='W' and is_delete<>'1'";
+                    dynamicParams.Add("@wkshp", excelTable[2].Rows[k][6].ToString());
+                    var data = DapperHelper.selectdata(sql0, dynamicParams);
+
+                    sql = @"insert into TEqpInfo(code,name,eqptype_code,eqpgroup_code,wksp_code,input_date,operation_ration,enable,opc_uom,lm_user,lm_date) 
+                            values(@devicecode,@devicename,@devicetype,@devicegroup,@workshop,@importdate,@ratio,@status,@uom,@lm_user,@lm_date)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            devicecode = excelTable[2].Rows[k][1].ToString().Trim(),
+                            devicename = excelTable[2].Rows[k][2].ToString().Trim(),
+                            devicetype = excelTable[2].Rows[k][3].ToString().Trim(),
+                            devicegroup = excelTable[2].Rows[k][4].ToString().Trim(),
+                            workshop = data.Rows[0]["org_code"].ToString().Trim(),
+                            importdate = excelTable[2].Rows[k][5].ToString().Trim(),
+                            ratio = excelTable[2].Rows[k][8].ToString().Trim(),
+                            status = excelTable[2].Rows[k][7].ToString().Trim(),
+                            uom = "鍙�",
+                            lm_user = User,
+                            lm_date = DateTime.Now.ToString()
+                        }
+                    });
+                }
+
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {
@@ -2601,14 +3703,82 @@
         }
         #endregion
 
-        #region銆怑xcel鏁版嵁涓婁紶,璁惧鐐规銆�
+        #region銆怑xcel鏁版嵁涓婁紶,璁惧鐐规椤圭洰銆�
         public static string TenSubmit(string FileCode, string User, out string StuCode)
         {
             string message = "";
             StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
-
+                list.Clear();
+                DataTable excelTable = new DataTable();
+                excelTable = ImportExcel.ExcelToTable(FileCode);
+                //瀵煎叆璁惧鐐规椤圭洰琛�
+                for (int i = 0; i < excelTable.Rows.Count; i++)
+                {
+                    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][4].ToString().Trim())
+                    {
+                        case "鏄�":
+                            IsScan = "Y";
+                            break;
+                        case "鍚�":
+                            IsScan = "N";
+                            break;
+                        default:
+                            break;
+                    }
+                    sql = @"insert into TEqpchk_Item(code,name,description,isscan,cycle,lm_user,lm_date) 
+                            values(@code,@name,@descr,@isscan,@cycle,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable.Rows[i][1].ToString().Trim(),
+                            name = excelTable.Rows[i][2].ToString().Trim(),
+                            descr = excelTable.Rows[i][5].ToString().Trim(),
+                            isscan = IsScan,
+                            cycle = Type,
+                            Operator = User,
+                            CreateDate = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {
@@ -2619,14 +3789,258 @@
         }
         #endregion
 
-        #region銆怑xcel鏁版嵁涓婁紶,璁惧淇濆吇銆�
+        #region銆怑xcel鏁版嵁涓婁紶,璁惧鐐规鏍囧噯銆�
+        public static string TwentyTwoSubmit(string FileCode, string User, out string StuCode)
+        {
+            string message = "";
+            StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                list.Clear();
+                List<DataTable> excelTable = new List<DataTable>();
+                excelTable = ImportExcel.ExcelToTableList(FileCode);
+                //瀵煎叆璁惧鐐规鏍囧噯涓昏〃
+                for (int k = 0; k < excelTable[0].Rows.Count; k++)
+                {
+                    sql = @"insert into TEqpchk_Main(code,name,description,iscontr,lm_user,lm_date) 
+                            values(@code,@name,@description,@iscontr,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        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(),
+                            CreateDate = DateTime.Now.ToString(),
+                            Operator = User
+                        }
+                    });
+                }
+                //瀵煎叆璁惧鐐规鏍囧噯閮ㄤ綅瀛愯〃
+                for (int i = 0; i < excelTable[1].Rows.Count; i++)
+                {
+                    string Type = "";
+                    switch (excelTable[1].Rows[i][7].ToString().Trim())
+                    {
+                        case "鏃�":
+                            Type = "D";
+                            break;
+                        default:
+                            break;
+                    }
+                    sql = @"insert into TEqpchk_Deta(seq,code,name,eqpchk_main_code,chkdesc,isscan,cycle,lm_user,lm_date) 
+                            values(@seq,@code,@name,@eqpchk_main_code,@description,@isscan,@cycle,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            seq = excelTable[1].Rows[i][1].ToString().Trim(),
+                            code = excelTable[1].Rows[i][3].ToString().Trim(),
+                            name = excelTable[1].Rows[i][4].ToString().Trim(),
+                            eqpchk_main_code = excelTable[1].Rows[i][2].ToString().Trim(),
+                            description = excelTable[1].Rows[i][5].ToString().Trim(),
+                            isscan = excelTable[1].Rows[i][6].ToString().Trim(),
+                            cycle = Type,
+                            Operator = User,
+                            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 ElevenSubmit(string FileCode, string User, out string StuCode)
         {
             string message = "";
             StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
+                list.Clear();
+                DataTable excelTable = new DataTable();
+                excelTable = ImportExcel.ExcelToTable(FileCode);
+                //瀵煎叆璁惧鐐规椤圭洰琛�
+                for (int i = 0; i < excelTable.Rows.Count; i++)
+                {
+                    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())
+                    {
+                        case "鏄�":
+                            IsScan = "Y";
+                            break;
+                        case "鍚�":
+                            IsScan = "N";
+                            break;
+                        default:
+                            break;
+                    }
+                    sql = @"insert into TEqpmai_Item(code,name,description,isscan,cycle,lm_user,lm_date) 
+                            values(@code,@name,@descr,@isscan,@cycle,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable.Rows[i][1].ToString().Trim(),
+                            name = excelTable.Rows[i][2].ToString().Trim(),
+                            descr = excelTable.Rows[i][4].ToString().Trim(),
+                            isscan = IsScan,
+                            cycle = "",
+                            Operator = User,
+                            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 TwentyThreeSubmit(string FileCode, string User, out string StuCode)
+        {
+            string message = "";
+            StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            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())
+                    {
+                        case "骞�":
+                            Type = "Y";
+                            break;
+                        case "瀛�":
+                            Type = "S";
+                            break;
+                        case "鏈�":
+                            Type = "M";
+                            break;
+                        case "鍛�":
+                            Type = "W";
+                            break;
+                        default:
+                            break;
+                    }
+                    sql = @"insert into TEqpmai_Main(code,name,description,main_cycle,lm_user,lm_date) 
+                            values(@code,@name,@description,@main_cycle,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable[0].Rows[k][1].ToString().Trim(),
+                            name = excelTable[0].Rows[k][2].ToString().Trim(),
+                            main_cycle = Type,
+                            description = excelTable[0].Rows[k][4].ToString().Trim(),
+                            CreateDate = DateTime.Now.ToString(),
+                            Operator = User
+                        }
+                    });
+                }
+                //瀵煎叆璁惧淇濆吇鏍囧噯閮ㄤ綅瀛愯〃
+                for (int i = 0; i < excelTable[1].Rows.Count; i++)
+                {
+                    sql = @"insert into TEqpmai_Deta(seq,code,name,eapmai_code,chk_desc,isscan,lm_user,lm_date) 
+                            values(@seq,@code,@name,@eapmai_code,@description,@isscan,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            seq = excelTable[1].Rows[i][1].ToString().Trim(),
+                            code = excelTable[1].Rows[i][3].ToString().Trim(),
+                            name = excelTable[1].Rows[i][4].ToString().Trim(),
+                            eapmai_code = excelTable[1].Rows[i][2].ToString().Trim(),
+                            description = excelTable[1].Rows[i][5].ToString().Trim(),
+                            isscan = excelTable[1].Rows[i][6].ToString().Trim(),
+                            Operator = User,
+                            CreateDate = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {
@@ -2727,6 +4141,168 @@
         }
         #endregion
 
+        #region銆怑xcel鏁版嵁涓婁紶,鑺傛媿宸ヤ环銆�
+        public static string TwentyFourSubmit(string FileCode, string User, out string StuCode)
+        {
+            string message = "";
+            StuCode = "";
+            string sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                list.Clear();
+                DataTable excelTable = new DataTable();
+                excelTable = ImportExcel.ExcelToTable(FileCode);
+                //瀵煎叆璁惧鐐规椤圭洰琛�
+                for (int i = 0; i < excelTable.Rows.Count; i++)
+                {
+                    string partcode = "", routecode = "", stepcode = "", eqpcode = "", wkspcode = "";
+                    //鏌ヨ浜у搧缂栫爜
+                    sql = @"select partcode from TMateriel_Info 
+                        where partname=@partname";
+                    dynamicParams.Add("@partname", excelTable.Rows[i][1].ToString().Trim());
+                    var data = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data.Rows.Count > 0)
+                    {
+                        partcode = data.Rows[0]["partcode"].ToString();
+                    }
+                    else
+                    {
+                        StuCode = "浜у搧鍚嶇О锛氥��" + excelTable.Rows[i][1].ToString().Trim() + "銆戝搴旂紪鐮佷笉瀛樺湪锛�";
+                        message = "瀵煎叆澶辫触锛�";
+                    }
+                    //鏌ヨ宸ヨ壓璺嚎缂栫爜
+                    sql = @"select code from TFlw_Rout 
+                        where name=@routename";
+                    dynamicParams.Add("@routename", excelTable.Rows[i][2].ToString().Trim());
+                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data0.Rows.Count > 0)
+                    {
+                        routecode = data0.Rows[0]["code"].ToString();
+                    }
+                    else
+                    {
+                        StuCode = "宸ヨ壓璺嚎鍚嶇О锛氥��" + excelTable.Rows[i][2].ToString().Trim() + "銆戝搴旂紪鐮佷笉瀛樺湪锛�";
+                        message = "瀵煎叆澶辫触锛�";
+                    }
+                    //鏌ヨ宸ュ簭缂栫爜
+                    sql = @"select stepcode from TStep 
+                        where stepname=@stepname";
+                    dynamicParams.Add("@stepname", excelTable.Rows[i][3].ToString().Trim());
+                    var data1 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data1.Rows.Count > 0)
+                    {
+                        stepcode = data1.Rows[0]["stepcode"].ToString();
+                    }
+                    else
+                    {
+                        StuCode = "宸ュ簭鍚嶇О锛氥��" + excelTable.Rows[i][3].ToString().Trim() + "銆戝搴旂紪鐮佷笉瀛樺湪锛�";
+                        message = "瀵煎叆澶辫触锛�";
+                    }
+                    //鏌ヨ璁惧缂栫爜
+                    sql = @"select code from TEqpInfo 
+                        where name=@eqpname";
+                    dynamicParams.Add("@eqpname", excelTable.Rows[i][4].ToString().Trim());
+                    var data4 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data4.Rows.Count > 0)
+                    {
+                        eqpcode = data4.Rows[0]["code"].ToString();
+                    }
+                    else
+                    {
+                        StuCode = "璁惧鍚嶇О锛氥��" + excelTable.Rows[i][4].ToString().Trim() + "銆戝搴旂紪鐮佷笉瀛樺湪锛�";
+                        message = "瀵煎叆澶辫触锛�";
+                    }
+                    //鏌ヨ杞﹂棿缂栫爜
+                    sql = @"select wksp_code from TEqpInfo 
+                        where name=@eqpname";
+                    dynamicParams.Add("@eqpname", excelTable.Rows[i][4].ToString().Trim());
+                    var data5 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data5.Rows.Count > 0)
+                    {
+                        wkspcode = data5.Rows[0]["wksp_code"].ToString();
+                    }
+                    else
+                    {
+                        StuCode = "璁惧鍚嶇О锛氥��" + excelTable.Rows[i][4].ToString().Trim() + "銆戝搴旇溅闂寸紪鐮佷笉瀛樺湪锛�";
+                        message = "瀵煎叆澶辫触锛�";
+                    }
+                    //鏌ヨ宸ュ簭鑺傛媿琛ㄤ腑锛氫骇鍝�+宸ヨ壓璺嚎+宸ュ簭+璁惧鏄惁瀛樺湪
+                    sql = @"select *  from TPrteEqp_Stad
+                        where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode";
+                    dynamicParams.Add("@partcode", partcode);
+                    dynamicParams.Add("@routecode", routecode);
+                    dynamicParams.Add("@stepcode", stepcode);
+                    dynamicParams.Add("@eqpcode", eqpcode);
+                    var data6 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data6.Rows.Count > 0)
+                    {
+                        sql = @"update TPrteEqp_Stad set stand_value=@stand_value,eqp_value=@eqp_value,cavity_qty=@cavity_qty,unprice=@unprice,lm_user=@username,lm_date=@userdate
+                            where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode ";
+                        list.Add(new
+                        {
+                            str = sql,
+                            parm = new
+                            {
+                                partcode = partcode,
+                                routecode = routecode,
+                                stepcode = stepcode,
+                                eqpcode = eqpcode,
+                                stand_value = excelTable.Rows[i][7].ToString().Trim(),
+                                eqp_value = excelTable.Rows[i][6].ToString().Trim(),
+                                cavity_qty = excelTable.Rows[i][8].ToString().Trim(),
+                                unprice = excelTable.Rows[i][5].ToString().Trim(),
+                                username = User,
+                                userdate = DateTime.Now.ToString()
+                            }
+                        });
+                    }
+                    else
+                    {
+                        sql = @"insert into TPrteEqp_Stad(materiel_code,eqp_code,stand_value,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,step_code) 
+                              values(@partcode,@eqpcode,@stand_value,@routecode,@unprice,@eqp_value,@cavity_qty,@wkspcode,@username,@userdate,@stepcode)";
+                        list.Add(new
+                        {
+                            str = sql,
+                            parm = new
+                            {
+                                partcode = partcode,
+                                eqpcode = eqpcode,
+                                stand_value = excelTable.Rows[i][7].ToString().Trim(),
+                                routecode = routecode,
+                                unprice = excelTable.Rows[i][5].ToString().Trim(),
+                                eqp_value = excelTable.Rows[i][6].ToString().Trim(),
+                                cavity_qty = excelTable.Rows[i][8].ToString().Trim(),
+                                wkspcode = wkspcode,
+                                username = User,
+                                userdate = DateTime.Now.ToString(),
+                                stepcode = stepcode
+                            }
+                        });
+                    }
+                }
+                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 SeventeenSubmit(string FileCode, string User, out string StuCode)
         {
@@ -2750,9 +4326,44 @@
         {
             string message = "";
             StuCode = "";
+            string sql = "";
+            DataTable dt;
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
-
+                list.Clear();
+                DataTable excelTable = new DataTable();
+                excelTable = ImportExcel.ExcelToTable(FileCode);
+                //瀵煎叆寰�鏉ュ崟浣嶈〃
+                for (int i = 0; i < excelTable.Rows.Count; i++)
+                {
+                    sql = @"insert into TDefect(code,name,descr,lm_user,lm_date) 
+                            values(@code,@name,@descr,@Operator,@CreateDate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = excelTable.Rows[i][1].ToString().Trim(),
+                            name = excelTable.Rows[i][2].ToString().Trim(),
+                            descr = excelTable.Rows[i][3].ToString().Trim(),
+                            Operator = User,
+                            CreateDate = DateTime.Now.ToString()
+                        }
+                    });
+                }
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {
@@ -2802,11 +4413,85 @@
         #region銆怑xcel鏁版嵁涓婁紶,鐗╂枡娓呭崟銆�
         public static string TwentyOneSubmit(string FileCode, string User, out string StuCode)
         {
-            string message = "";
-            StuCode = "";
+            string message = ""; StuCode = "";
+            string sql = "";
+            int BomID = 0;  //鏈�澶d
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
             try
             {
+                list.Clear();
+                List<DataTable> excelTable = new List<DataTable>();
+                excelTable = ImportExcel.ExcelToTableList(FileCode);
+                //鑾峰彇涓昏〃褰撳墠鏈�澶D
+                BomID = DapperHelper.insertReturnId("TBom_Main");
+                //瀵煎叆Bom涓昏〃
+                for (int k = 0; k < excelTable[0].Rows.Count; k++)
+                {
+                    BomID = BomID + 1;
+                    sql = @"insert into TBom_Main(materiel_code,quantity,status,version,lm_user,lm_date,startdate) 
+                            values(@materiel_code,@quantity,@status,@version,@lm_user,@lm_date,@startdate)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            materiel_code = excelTable[0].Rows[k][1].ToString().Trim(),
+                            quantity = excelTable[0].Rows[k][3].ToString().Trim(),
+                            status = excelTable[0].Rows[k][4].ToString().Trim(),
+                            version = excelTable[0].Rows[k][5].ToString().Trim(),
+                            lm_user = User,
+                            lm_date = DateTime.Now.ToString(),
+                            startdate = DateTime.Now.ToString()
+                        }
+                    });
+                    //鏌ヨ姣嶄欢淇℃伅瀵瑰簲鐨勫瓙浠朵俊鎭�
+                    DataTable ds = excelTable[1].AsEnumerable().Where(item => item["涓昏〃搴忓垪鍙�"].ToString().Equals(excelTable[0].Rows[k][0].ToString())).CopyToDataTable();
+                    //瀵煎叆Bom瀛愯〃
+                    for (int i = 0; i < ds.Rows.Count; i++)
+                    {
+                        string Type = "";
+                        switch (ds.Rows[i][9].ToString().Trim())
+                        {
+                            case "涓绘枡":
+                                Type = "Z";
+                                break;
+                            case "杈呮枡":
+                                Type = "F";
+                                break;
+                            default:
+                                break;
+                        }
+                        sql = @"insert into TBom_Deta(m_id,seq,smateriel_code,base_quantity,loss_quantity,total_quantity,pn_type) 
+                            values(@m_id,@seq,@smateriel_code,@base_quantity,@loss_quantity,@total_quantity,@pn_type)";
+                        list.Add(new
+                        {
+                            str = sql,
+                            parm = new
+                            {
+                                m_id = BomID,
+                                seq = ds.Rows[i][2].ToString().Trim(),
+                                smateriel_code = ds.Rows[i][3].ToString().Trim(),
+                                base_quantity = ds.Rows[i][6].ToString().Trim(),
+                                loss_quantity = ds.Rows[i][7].ToString().Trim(),
+                                total_quantity = ds.Rows[i][8].ToString().Trim(),
+                                pn_type = Type
+                            }
+                        });
+                    }
+                }
 
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    StuCode = "200";
+                    message = "瀵煎叆鎴愬姛锛�";
+                }
+                else
+                {
+                    StuCode = "300";
+                    message = "瀵煎叆澶辫触锛�";
+                }
             }
             catch (Exception e)
             {

--
Gitblit v1.9.3