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/wwwroot/Excel/模具点检标准.xls | 0
VueWebCoreApi/Controllers/ImportExcelController.cs | 5 +
VueWebCoreApi/VueWebCoreApi.csproj | 2
VueWebCoreApi/wwwroot/Excel/设备保养标准.xls | 0
VueWebCoreApi/wwwroot/Excel/设备点检标准.xls | 0
VueWebCoreApi/Tools/ImportExcelData.cs | 86 ++++++++++++++--------------
VueWebCoreApi/wwwroot/Excel/模具保养标准.xls | 0
VueWebCoreApi/Tools/ImportExcel.cs | 65 +++++++++++++++------
8 files changed, 95 insertions(+), 63 deletions(-)
diff --git a/VueWebCoreApi/Controllers/ImportExcelController.cs b/VueWebCoreApi/Controllers/ImportExcelController.cs
index 16276d0..e2ef326 100644
--- a/VueWebCoreApi/Controllers/ImportExcelController.cs
+++ b/VueWebCoreApi/Controllers/ImportExcelController.cs
@@ -15,7 +15,7 @@
[ApiExplorerSettings(GroupName = "Excel瀵煎叆")]
[ApiController]
[Route("api/[controller]")]
- [ChannelActionFilter]
+ //[ChannelActionFilter]
public class ImportExcelController : Controller
{
@@ -167,7 +167,8 @@
ToMessage mes = new ToMessage();
try
{
- var token = HttpContext.Request.Headers["Token"].ToString();
+ //var token = HttpContext.Request.Headers["Token"].ToString();
+ var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OSIsInVzZXJuYW1lIjoi5rWL6K-V6LSm5Y-3Iiwic3RvcmdfY29kZSI6IlNDQjAxXzEiLCJzdG9yZ19uYW1lIjoi55Sf5Lqn5LiA6YOoIiwiaXNfc3lzdGVtX2FkbWluIjoiTiIsInJvbGVfY29kZSI6IlIyMzA4MjMwMiw5OTk5Iiwicm9sZV9kYXRhcGVybWlzc2lvbnMiOiIiLCJ1c2VydHlwZSI6IlBDIiwicmVkaXNrZXkiOiJOZXdNRVNMb2dpblVzZXJJRFBDOTk5IiwidGltZW91dCI6IjIwMjMtMTItMTVUMTc6MTg6MjEuMTQyMjc1MiswODowMCJ9.IPaJpspiHjk4Qh9keXNy8lJl1Scj87EnnksKd8Hnj8o";
User us = JwtTools.Denocode(token.ToString());
mes = ExcelCheckBLL.ExcelImportSubmit(FileCode, dataTable, us);
if (mes.code == "300")
diff --git a/VueWebCoreApi/Tools/ImportExcel.cs b/VueWebCoreApi/Tools/ImportExcel.cs
index ef19619..5a4cb36 100644
--- a/VueWebCoreApi/Tools/ImportExcel.cs
+++ b/VueWebCoreApi/Tools/ImportExcel.cs
@@ -1292,30 +1292,59 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = (rowIndex + 1).ToString();
erro.ErrorField = emptyColumn.ColumnName;
- erro.ErrorCont = "妯℃澘琛ㄥご甯�*鐨勫垪涓瓨鍦ㄧ┖鍊�,绗�" + (rowIndex + 1).ToString() + "琛�,蹇呭～瀛楁锛�"+ emptyColumn.ColumnName +"涓虹┖";
+ erro.ErrorCont = "妯℃澘琛ㄥご甯�*鐨勫垪涓瓨鍦ㄧ┖鍊�,绗�" + (rowIndex + 1).ToString() + "琛�,蹇呭～瀛楁锛�" + emptyColumn.ColumnName + "涓虹┖";
list.Add(erro);
}
- var duplicateColumn = excelTable[i].Columns.Cast<DataColumn>().FirstOrDefault(
- column => column.ColumnName.Contains("鍞竴") && excelTable[i].AsEnumerable().GroupBy(row => row[column]).Any(group => group.Count() > 1));
- if (duplicateColumn != null)
+ if (excelTable[i].Columns.Cast<DataColumn>().Any(column => column.ColumnName.Contains("M")))
{
- int columnIndex = excelTable[i].Columns.IndexOf(duplicateColumn);
- var duplicateRows = excelTable[i].AsEnumerable()
- .Where(row => row[duplicateColumn] != DBNull.Value)
- .GroupBy(row => row[duplicateColumn])
- .Where(group => group.Count() > 1)
- .SelectMany(group => group.ToList())
- .ToList();
- foreach (var row in duplicateRows)
+ var duplicateColumn = excelTable[i].Columns.Cast<DataColumn>().FirstOrDefault(
+ column => column.ColumnName.Contains("M") && excelTable[i].AsEnumerable().GroupBy(row => new { Field1 = row[column], Field2 = column.ColumnName.Contains("鍞竴") }).Any(group => group.Count() > 1));
+ if (duplicateColumn != null)
{
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = excelTable[i].Rows.IndexOf(row).ToString();
- erro.ErrorField = duplicateColumn.ColumnName;
- erro.ErrorCont = "妯℃澘琛ㄥご甯�(鍞竴)鐨勫垪涓瓨鍦ㄩ噸澶嶅��,绗�" + excelTable[i].Rows.IndexOf(row).ToString() + "琛�,蹇呭～瀛楁锛�" + duplicateColumn.ColumnName + "閲嶅";
- list.Add(erro);
-
+ int columnIndex = excelTable[i].Columns.IndexOf(duplicateColumn);
+ var duplicateRows = excelTable[i].AsEnumerable()
+ .Where(row => row[duplicateColumn] != DBNull.Value)
+ .GroupBy(row => row[duplicateColumn])
+ .Where(group => group.Count() > 1)
+ .SelectMany(group => group.ToList())
+ .ToList();
+ foreach (var row in duplicateRows)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = excelTable[i].Rows.IndexOf(row).ToString();
+ erro.ErrorField = duplicateColumn.ColumnName;
+ erro.ErrorCont = "妯℃澘琛ㄥご瀛楁锛�" + duplicateColumn.ColumnName + "涓嬪悓涓�鍊�,瀵瑰簲甯�(鍞竴)鐨勫垪涓瓨鍦ㄩ噸澶嶅��";
+ list.Add(erro);
+
+ }
}
}
+ else
+ {
+ var duplicateColumn = excelTable[i].Columns.Cast<DataColumn>().FirstOrDefault(
+ column => column.ColumnName.Contains("鍞竴") && excelTable[i].AsEnumerable().GroupBy(row => row[column]).Any(group => group.Count() > 1));
+ if (duplicateColumn != null)
+ {
+ int columnIndex = excelTable[i].Columns.IndexOf(duplicateColumn);
+ var duplicateRows = excelTable[i].AsEnumerable()
+ .Where(row => row[duplicateColumn] != DBNull.Value)
+ .GroupBy(row => row[duplicateColumn])
+ .Where(group => group.Count() > 1)
+ .SelectMany(group => group.ToList())
+ .ToList();
+ foreach (var row in duplicateRows)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = excelTable[i].Rows.IndexOf(row).ToString();
+ erro.ErrorField = duplicateColumn.ColumnName;
+ erro.ErrorCont = "妯℃澘琛ㄥご甯�(鍞竴)鐨勫垪涓瓨鍦ㄩ噸澶嶅��,绗�" + excelTable[i].Rows.IndexOf(row).ToString() + "琛�,蹇呭～瀛楁锛�" + duplicateColumn.ColumnName + "閲嶅";
+ list.Add(erro);
+
+ }
+ }
+ }
+
+
}
return list;
}
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,
diff --git a/VueWebCoreApi/VueWebCoreApi.csproj b/VueWebCoreApi/VueWebCoreApi.csproj
index 03e5667..275fb7a 100644
--- a/VueWebCoreApi/VueWebCoreApi.csproj
+++ b/VueWebCoreApi/VueWebCoreApi.csproj
@@ -17,6 +17,8 @@
<OutputPath>bin\</OutputPath>
<DocumentationFile>bin\VueWebCoreApi.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn>
+ <Optimize>false</Optimize>
+ <DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
diff --git "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\346\240\207\345\207\206.xls" "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\346\240\207\345\207\206.xls"
index 4899676..13c4662 100644
--- "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\346\240\207\345\207\206.xls"
+++ "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\346\240\207\345\207\206.xls"
Binary files differ
diff --git "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\346\240\207\345\207\206.xls" "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\346\240\207\345\207\206.xls"
index 552b8c6..c3886da 100644
--- "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\346\240\207\345\207\206.xls"
+++ "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\346\240\207\345\207\206.xls"
Binary files differ
diff --git "a/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\346\240\207\345\207\206.xls" "b/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\346\240\207\345\207\206.xls"
index 1b74f93..dcf1d7c 100644
--- "a/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\346\240\207\345\207\206.xls"
+++ "b/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\346\240\207\345\207\206.xls"
Binary files differ
diff --git "a/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls" "b/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls"
index 6b246c1..e1a0c02 100644
--- "a/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls"
+++ "b/VueWebCoreApi/wwwroot/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls"
Binary files differ
--
Gitblit v1.9.3