From c658c28dab9fb3a028af9647fb358f01956c7c10 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 15 十二月 2023 15:48:46 +0800
Subject: [PATCH] 1.修改模具、设备点检标准、保养标准导入模板 2.修改模具、设备点检标准、保养标准导入数据校验方法

---
 VueWebCoreApi/Tools/ImportExcelData.cs |   86 +++++++++++++++++++++---------------------
 1 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 347c6a7..d42c289 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -794,16 +794,16 @@
                 Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鏍囧噯鎻忚堪}";
                 return Message;
             }
-            else if (excelTable[1].Columns[0].ColumnName != "*鐐规椤瑰簭鍙�")
+            else if (excelTable[1].Columns[0].ColumnName != "*璁惧鐐规鏍囧噯缂栧彿(M)")
             {
                 code = "300";
-                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*鐐规椤瑰簭鍙穧";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*璁惧鐐规鏍囧噯缂栧彿(M)}";
                 return Message;
             }
-            else if (excelTable[1].Columns[1].ColumnName != "*璁惧鐐规鏍囧噯缂栧彿")
+            else if (excelTable[1].Columns[1].ColumnName != "*鐐规椤瑰簭鍙�")
             {
                 code = "300";
-                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*璁惧鐐规鏍囧噯缂栧彿}";
+                Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*鐐规椤瑰簭鍙穧";
                 return Message;
             }
             else if (excelTable[1].Columns[2].ColumnName != "*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)")
@@ -944,16 +944,16 @@
                 Message = "璁惧淇濆吇鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鏍囧噯鎻忚堪}";
                 return Message;
             }
-            else if (excelTable[1].Columns[0].ColumnName != "*淇濆吇椤瑰簭鍙�")
+            else if (excelTable[1].Columns[0].ColumnName != "*璁惧淇濆吇鏍囧噯缂栧彿(M)")
             {
                 code = "300";
-                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*淇濆吇椤瑰簭鍙穧";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*璁惧淇濆吇鏍囧噯缂栧彿(M)}";
                 return Message;
             }
-            else if (excelTable[1].Columns[1].ColumnName != "*璁惧淇濆吇鏍囧噯缂栧彿")
+            else if (excelTable[1].Columns[1].ColumnName != "*淇濆吇椤瑰簭鍙�")
             {
                 code = "300";
-                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*璁惧淇濆吇鏍囧噯缂栧彿}";
+                Message = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*淇濆吇椤瑰簭鍙穧";
                 return Message;
             }
             else if (excelTable[1].Columns[2].ColumnName != "*璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)")
@@ -1157,10 +1157,10 @@
                 Message = "妯″叿鐐规鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鏍囧噯鎻忚堪}";
                 return Message;
             }
-            else if (excelTable[1].Columns[0].ColumnName != "*妯″叿鐐规鏍囧噯缂栧彿")
+            else if (excelTable[1].Columns[0].ColumnName != "*妯″叿鐐规鏍囧噯缂栧彿(M)")
             {
                 code = "301";
-                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿鐐规鏍囧噯缂栧彿}";
+                Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿鐐规鏍囧噯缂栧彿(M)}";
                 return Message;
             }
             else if (excelTable[1].Columns[1].ColumnName != "*鐐规椤瑰簭鍙�")
@@ -1283,10 +1283,10 @@
                 Message = "妯″叿淇濆吇鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鏍囧噯鎻忚堪}";
                 return Message;
             }
-            else if (excelTable[1].Columns[0].ColumnName != "*妯″叿淇濆吇鏍囧噯缂栧彿")
+            else if (excelTable[1].Columns[0].ColumnName != "*妯″叿淇濆吇鏍囧噯缂栧彿(M)")
             {
                 code = "301";
-                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯缂栧彿}";
+                Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯缂栧彿(M)}";
                 return Message;
             }
             else if (excelTable[1].Columns[1].ColumnName != "*淇濆吇椤瑰簭鍙�")
@@ -3089,23 +3089,23 @@
                     {
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
-                        erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
-                        erro.ErrorCont = "璁惧鐐规鏍囧噯琛�:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][0].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+                        erro.ErrorField = "{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+                        erro.ErrorCont = "璁惧鐐规鏍囧噯琛�:{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][0].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
                         list.Add(erro);
                     }
                     //閫氳繃璁惧鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ璁惧鐐规閮ㄤ綅椤电妯℃澘涓搴旂殑鏁版嵁淇℃伅
-                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["璁惧鐐规鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*璁惧鐐规鏍囧噯缂栧彿(M)"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
                     DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
                     if (ds.Rows.Count > 0)
                     {
-                        //鍒ゆ柇淇濆吇鏍囧噯鏌ヨ淇濆吇閮ㄤ綅鏁版嵁鏄惁鏈夐噸澶�
+                        //鍒ゆ柇鐐规鏍囧噯鏌ヨ鐐规閮ㄤ綅鏁版嵁鏄惁鏈夐噸澶�
                         DataTable distinct1 = ds.DefaultView.ToTable(true, "*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)");
                         if (distinct1.Rows.Count != ds.Rows.Count)
                         {
                             ExcelErro erro = new ExcelErro();
                             erro.RoeNumber = "/";
                             erro.ErrorField = "{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
-                            erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 瀵瑰簲{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
+                            erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 瀵瑰簲{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
                             list.Add(erro);
                         }
                     }
@@ -3114,7 +3114,7 @@
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
                         erro.ErrorField = "{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
-                        erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 鍦ㄨ澶囩偣妫�鏍囧噯椤电妯℃澘涓笉瀛樺湪";
+                        erro.ErrorCont = "璁惧鐐规鏍囧噯妯℃澘sheet1涓"+(j+1)+ "琛�:{*璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}:" + excelTable[0].Rows[j][0].ToString().Trim() + " 鍦ㄨ澶囩偣妫�鏍囧噯妯℃澘sheet2涓瓄*璁惧鐐规鏍囧噯缂栧彿(M)}鍒椾笉瀛樺湪";
                         list.Add(erro);
                     }
                 }
@@ -3142,15 +3142,15 @@
                       where !(
                           from rr in excelTable[0].AsEnumerable()
                           select rr.Field<string>("*璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
-                      ).Contains(r.Field<string>("璁惧鐐规鏍囧噯缂栧彿"))
+                      ).Contains(r.Field<string>("*璁惧鐐规鏍囧噯缂栧彿(M)"))
                       select r;
             List<DataRow> listRow = dt3.ToList();
             if (listRow.Count > 0)
             {
                 ExcelErro erro = new ExcelErro();
                 erro.RoeNumber = "/";
-                erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿}";
-                erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                erro.ErrorField = "{*璁惧鐐规鏍囧噯缂栧彿(M)}";
+                erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(M)}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{*璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
                 list.Add(erro);
             }
             if (list.Count > 0)
@@ -3272,7 +3272,7 @@
                         list.Add(erro);
                     }
                     //閫氳繃璁惧淇濆吇鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ璁惧淇濆吇閮ㄤ綅椤电妯℃澘涓搴旂殑鏁版嵁淇℃伅
-                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["璁惧淇濆吇鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*璁惧淇濆吇鏍囧噯缂栧彿(M)"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
                     DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[0].Clone();
                     if (ds.Rows.Count > 0)
                     {
@@ -3283,7 +3283,7 @@
                             ExcelErro erro = new ExcelErro();
                             erro.RoeNumber = "/";
                             erro.ErrorField = "{*璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}";
-                            erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 瀵瑰簲{璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
+                            erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 瀵瑰簲{*璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
                             list.Add(erro);
                         }
                     }
@@ -3292,7 +3292,7 @@
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
                         erro.ErrorField = "{*璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}";
-                        erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][1].ToString().Trim() + " 鍦ㄨ澶囦繚鍏绘爣鍑嗛〉绛炬ā鏉夸腑涓嶅瓨鍦�";
+                        erro.ErrorCont = "璁惧淇濆吇鏍囧噯妯℃澘sheet1涓" + (j + 1) + "琛�:{*璁惧淇濆吇閮ㄤ綅缂栧彿(鍞竴)}:" + excelTable[0].Rows[j][0].ToString().Trim() + " 鍦ㄨ澶囦繚鍏绘爣鍑嗘ā鏉縮heet2涓瓄*璁惧淇濆吇鏍囧噯缂栧彿(M)}鍒椾笉瀛樺湪";
                         list.Add(erro);
                     }
                 }
@@ -3320,15 +3320,15 @@
                       where !(
                           from rr in excelTable[0].AsEnumerable()
                           select rr.Field<string>("*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)")
-                      ).Contains(r.Field<string>("璁惧淇濆吇鏍囧噯缂栧彿"))
+                      ).Contains(r.Field<string>("*璁惧淇濆吇鏍囧噯缂栧彿(M)"))
                       select r;
             List<DataRow> listRow = dt3.ToList();
             if (listRow.Count > 0)
             {
                 ExcelErro erro = new ExcelErro();
                 erro.RoeNumber = "/";
-                erro.ErrorField = "{璁惧淇濆吇鏍囧噯缂栧彿}";
-                erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{璁惧淇濆吇鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪璁惧淇濆吇鏍囧噯椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                erro.ErrorField = "{*璁惧淇濆吇鏍囧噯缂栧彿(M)}";
+                erro.ErrorCont = "璁惧淇濆吇閮ㄤ綅椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿(M)}瀛楁涓湁鍊煎湪璁惧淇濆吇鏍囧噯椤电妯℃澘:{*璁惧淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
                 list.Add(erro);
             }
             if (list.Count > 0)
@@ -3547,7 +3547,7 @@
                         list.Add(erro);
                     }
                     //閫氳繃妯″叿鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿鐐规椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
-                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿鐐规鏍囧噯缂栧彿"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿鐐规鏍囧噯缂栧彿(M)"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
                     DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
                     if (ds.Rows.Count > 0)
                     {
@@ -3558,7 +3558,7 @@
                             ExcelErro erro = new ExcelErro();
                             erro.RoeNumber = "/";
                             erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
-                            erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 瀵瑰簲{*妯″叿鐐规椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
+                            erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 瀵瑰簲{*妯″叿鐐规椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
                             list.Add(erro);
                         }
                     }
@@ -3567,7 +3567,7 @@
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
                         erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
-                        erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏风偣妫�鏍囧噯椤电妯℃澘涓笉瀛樺湪";
+                        erro.ErrorCont = "妯″叿鐐规鏍囧噯妯℃澘sheet1涓" + (j + 1) + "琛�:{*妯″叿鐐规閮ㄤ綅缂栧彿(鍞竴)}:" + excelTable[0].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏风偣妫�鏍囧噯妯℃澘sheet2涓瓄*妯″叿鐐规鏍囧噯缂栧彿(M)}鍒椾笉瀛樺湪";
                         list.Add(erro);
                     }
                 }
@@ -3596,15 +3596,15 @@
                       where !(
                           from rr in excelTable[0].AsEnumerable()
                           select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)").Trim()
-                      ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿").Trim())
+                      ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(M)").Trim())
                       select r;
             List<DataRow> listRow = dt3.ToList();
             if (listRow.Count > 0)
             {
                 ExcelErro erro = new ExcelErro();
                 erro.RoeNumber = "/";
-                erro.ErrorField = "{*妯″叿鐐规鏍囧噯缂栧彿}";
-                erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪妯″叿鐐规鏍囧噯椤电妯℃澘:{*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                erro.ErrorField = "{*妯″叿鐐规鏍囧噯缂栧彿(M)}";
+                erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿(M)}瀛楁涓湁鍊煎湪妯″叿鐐规鏍囧噯椤电妯℃澘:{*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
                 list.Add(erro);
             }
             if (list.Count > 0)
@@ -3720,7 +3720,7 @@
                         list.Add(erro);
                     }
                     //閫氳繃妯″叿淇濆吇鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿淇濆吇椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
-                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿淇濆吇鏍囧噯缂栧彿"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
+                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿淇濆吇鏍囧噯缂栧彿(M)"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
                     DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
                     if (ds.Rows.Count > 0)
                     {
@@ -3731,7 +3731,7 @@
                             ExcelErro erro = new ExcelErro();
                             erro.RoeNumber = "/";
                             erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
-                            erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 瀵瑰簲{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
+                            erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿(M)}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 瀵瑰簲{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
                             list.Add(erro);
                         }
                     }
@@ -3740,7 +3740,7 @@
                         ExcelErro erro = new ExcelErro();
                         erro.RoeNumber = "/";
                         erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
-                        erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏蜂繚鍏绘爣鍑嗛〉绛炬ā鏉夸腑涓嶅瓨鍦�";
+                        erro.ErrorCont = "妯″叿淇濆吇鏍囧噯妯℃澘sheet1涓" + (j + 1) + "琛�:{*妯″叿淇濆吇閮ㄤ綅缂栧彿(鍞竴)}:" + excelTable[0].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏蜂繚鍏绘爣鍑嗘ā鏉縮heet2涓瓄*妯″叿淇濆吇鏍囧噯缂栧彿(M)}鍒椾笉瀛樺湪";
                         list.Add(erro);
                     }
                 }
@@ -3769,15 +3769,15 @@
                       where !(
                           from rr in excelTable[0].AsEnumerable()
                           select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)").Trim()
-                      ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿").Trim())
+                      ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(M)").Trim())
                       select r;
             List<DataRow> listRow = dt3.ToList();
             if (listRow.Count > 0)
             {
                 ExcelErro erro = new ExcelErro();
                 erro.RoeNumber = "/";
-                erro.ErrorField = "{*妯″叿淇濆吇鏍囧噯缂栧彿}";
-                erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪妯″叿淇濆吇鏍囧噯椤电妯℃澘:{*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+                erro.ErrorField = "{*妯″叿淇濆吇鏍囧噯缂栧彿(M)}";
+                erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿(M)}瀛楁涓湁鍊煎湪妯″叿淇濆吇鏍囧噯椤电妯℃澘:{*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
                 list.Add(erro);
             }
             if (list.Count > 0)
@@ -5108,10 +5108,10 @@
                         str = sql,
                         parm = new
                         {
-                            seq = excelTable[1].Rows[i][0].ToString().Trim(),
+                            seq = excelTable[1].Rows[i][1].ToString().Trim(),
                             code = excelTable[1].Rows[i][2].ToString().Trim(),
                             name = excelTable[1].Rows[i][3].ToString().Trim(),
-                            eqpchk_main_code = excelTable[1].Rows[i][1].ToString().Trim(),
+                            eqpchk_main_code = excelTable[1].Rows[i][0].ToString().Trim(),
                             description = excelTable[1].Rows[i][4].ToString().Trim(),
                             isscan = excelTable[1].Rows[i][5].ToString().Trim(),
                             cycle = Type,
@@ -5263,10 +5263,10 @@
                         str = sql,
                         parm = new
                         {
-                            seq = excelTable[1].Rows[i][0].ToString().Trim(),
+                            seq = excelTable[1].Rows[i][1].ToString().Trim(),
                             code = excelTable[1].Rows[i][2].ToString().Trim(),
                             name = excelTable[1].Rows[i][3].ToString().Trim(),
-                            eapmai_code = excelTable[1].Rows[i][1].ToString().Trim(),
+                            eapmai_code = excelTable[1].Rows[i][0].ToString().Trim(),
                             description = excelTable[1].Rows[i][4].ToString().Trim(),
                             isscan = excelTable[1].Rows[i][5].ToString().Trim(),
                             Operator = us.usercode,

--
Gitblit v1.9.3