From 15c6d7dec741a03bd7a84c3948fdc2a89e036395 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 10 十一月 2023 13:24:24 +0800
Subject: [PATCH] 1.生产加工单打印次数接口 2.工艺路线批量关联产品接口 3.修复用户所属班组绑定关系写入关系表
---
VueWebApi/Tools/ImportExcelData.cs | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index bb47779..38ee2ae 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -27,7 +27,7 @@
return Message;
}
- else if (excelTable[0].Columns.Count != 9)
+ else if (excelTable[0].Columns.Count != 10)
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -85,6 +85,12 @@
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�9鍒楀簲涓簕宸ヨ祫绫诲瀷}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[9].ColumnName != "鐝粍缂栫爜")
+ {
+ code = "300";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�10鍒楀簲涓簕鐝粍缂栫爜}";
return Message;
}
else
@@ -1855,6 +1861,20 @@
list.Add(erro);
}
}
+ if (excelTable.Rows[k][9].ToString().Trim() != null && excelTable.Rows[k][9].ToString().Trim() != "")
+ {
+ sql = @"select * from TGroup where group_code=@group_code";
+ dynamicParams.Add("@group_code", excelTable.Rows[k][9].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt == null || dt.Rows.Count <= 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{鐝粍缂栫爜}";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鐝粍缂栫爜}瀛楁" + excelTable.Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
+ list.Add(erro);
+ }
+ }
}
if (list.Count > 0)
{
--
Gitblit v1.9.3