From 6114886bd704d575a65f174e31311c8ae912ce99 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 17 十月 2023 20:08:20 +0800
Subject: [PATCH] 1.APP登录接口 2.模具维修、维修验证功能接口 3.模具上机、模具下机功能接口 4.模具外借、模具归还功能接口
---
VueWebCoreApi/Tools/ImportExcelData.cs | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 71e7ec5..6cf5cad 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -3479,8 +3479,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("妯″叿缂栫爜"))
+ select rr.Field<string>("*妯″叿缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("妯″叿缂栫爜").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
@@ -3605,7 +3605,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["*妯″叿鐐规鏍囧噯缂栧彿"].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)
{
@@ -3635,15 +3635,16 @@
{
if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
{
- sql = @"select * from TMouldchk_Item where code=@code";
+ sql = @"select * from TMouldchk_Item where code=@code and name=@name";
dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+ dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count < 0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
- erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴),*妯″叿鐐规椤瑰悕绉皚瀛楁{" + excelTable[1].Rows[k][2].ToString().Trim() +","+ excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏风偣妫�椤逛腑涓嶅瓨鍦�";
list.Add(erro);
}
}
@@ -3652,8 +3653,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿"))
+ select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
@@ -3777,7 +3778,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["*妯″叿淇濆吇鏍囧噯缂栧彿"].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)
{
@@ -3807,15 +3808,16 @@
{
if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
{
- sql = @"select * from TMouldmai_Item where code=@code";
+ sql = @"select * from TMouldmai_Item where code=@code and name=@name";
dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+ dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count < 0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
- erro.ErrorCont = "妯″叿淇濆吇閮ㄤ綅琛�:{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ erro.ErrorCont = "妯″叿淇濆吇閮ㄤ綅琛�:{*妯″叿淇濆吇椤圭紪鍙�(鍞竴),*妯″叿淇濆吇椤瑰悕绉皚瀛楁{" + excelTable[1].Rows[k][2].ToString().Trim() + "," + excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏蜂繚鍏婚」涓笉瀛樺湪";
list.Add(erro);
}
}
@@ -3824,8 +3826,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿"))
+ select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
--
Gitblit v1.9.3