From 48aa43a04f8d8a0964d9d8a206e329f400fd5b89 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 07 八月 2023 18:10:04 +0800
Subject: [PATCH] 1.移出班组功能，单独关联人员 2.用户清单取消指定班组 3.生产开报工增加扫码后选择设备 4.用户清单导入取消班组 5.erp订单查询、订单下达 mes工单查询、报废补单增加销售订单号
---
VueWebApi/Tools/ImportExcelData.cs | 206 ++++++++-------------------------------------------
1 files changed, 34 insertions(+), 172 deletions(-)
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 2ea8e76..bb47779 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -20,20 +20,14 @@
code = "";
List<DataTable> excelTable = new List<DataTable>();
excelTable = ImportExcel.ExcelToTableList(FileCode);
- if (excelTable.Count != 4)
+ if (excelTable.Count != 2)
{
code = "300";
Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
return Message;
}
- else if (excelTable[0].Columns.Count != 5)
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
- return Message;
- }
- else if (excelTable[1].Columns.Count != 10)
+ else if (excelTable[0].Columns.Count != 9)
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -42,91 +36,55 @@
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 = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐝粍缂栧彿(鍞竴)}";
- return Message;
- }
- else if (excelTable[0].Columns[3].ColumnName != "鐝粍鍚嶇О")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鐝粍鍚嶇О}";
- return Message;
- }
- else if (excelTable[0].Columns[4].ColumnName != "鐝粍鎻忚堪")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鐝粍鎻忚堪}";
- return Message;
- }
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
- {
- code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "鐢ㄦ埛缂栧彿(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "鐢ㄦ埛缂栧彿(鍞竴)")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐢ㄦ埛缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "鐢ㄦ埛濮撳悕")
+ else if (excelTable[0].Columns[2].ColumnName != "鐢ㄦ埛濮撳悕")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鐢ㄦ埛濮撳悕}";
return Message;
}
- else if (excelTable[1].Columns[3].ColumnName != "鍦ㄨ亴鐘舵��")
+ else if (excelTable[0].Columns[3].ColumnName != "鍦ㄨ亴鐘舵��")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鍦ㄨ亴鐘舵�亇";
return Message;
}
- else if (excelTable[1].Columns[4].ColumnName != "瀵嗙爜")
+ else if (excelTable[0].Columns[4].ColumnName != "瀵嗙爜")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕瀵嗙爜}";
return Message;
}
- else if (excelTable[1].Columns[5].ColumnName != "鎵嬫満鍙�")
+ else if (excelTable[0].Columns[5].ColumnName != "鎵嬫満鍙�")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鎵嬫満鍙穧";
return Message;
}
- else if (excelTable[1].Columns[6].ColumnName != "閭")
+ else if (excelTable[0].Columns[6].ColumnName != "閭")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕閭}";
return Message;
}
- else if (excelTable[1].Columns[7].ColumnName != "缁勭粐缂栫爜")
+ else if (excelTable[0].Columns[7].ColumnName != "缁勭粐缂栫爜")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕缁勭粐缂栫爜}";
return Message;
}
- else if (excelTable[1].Columns[8].ColumnName != "宸ヨ祫绫诲瀷")
+ else if (excelTable[0].Columns[8].ColumnName != "宸ヨ祫绫诲瀷")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�9鍒楀簲涓簕宸ヨ祫绫诲瀷}";
- return Message;
- }
- else if (excelTable[1].Columns[9].ColumnName != "鐢ㄦ埛缁勭紪鐮�")
- {
- code = "300";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�10鍒楀簲涓簕鐢ㄦ埛缁勭紪鐮亇";
return Message;
}
else
@@ -1864,106 +1822,39 @@
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鏁版嵁
- //涓昏〃
- for (int j = 0; j < excelTable[0].Rows.Count; j++)
+ DataTable excelTable = new DataTable();
+ list = ImportExcel.ExcelToTableErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTable(FileCode); //鑾峰彇Excel鏁版嵁
+ for (int k = 0; k < excelTable.Rows.Count; k++)
{
- if (excelTable[0].Rows[j][2].ToString().Trim() != null && excelTable[0].Rows[j][2].ToString().Trim() != "")
- {
- sql = @"select * from TGroup where group_code=@group_code";
- dynamicParams.Add("@group_code", excelTable[0].Rows[j][2].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][2].ToString().Trim() + "宸插瓨鍦�";
- list.Add(erro);
- }
- }
- }
- //瀛愯〃
- for (int k = 0; k < excelTable[1].Rows.Count; k++)
- {
- if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
+ if (excelTable.Rows[k][1].ToString().Trim() != null && excelTable.Rows[k][1].ToString().Trim() != "")
{
sql = @"select * from TUser where usercode=@usercode";
- dynamicParams.Add("@usercode", excelTable[1].Rows[k][1].ToString().Trim());
+ dynamicParams.Add("@usercode", excelTable.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[1].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable.Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
- if (excelTable[1].Rows[k][7].ToString().Trim() != null && excelTable[1].Rows[k][7].ToString().Trim() != "")
+ if (excelTable.Rows[k][7].ToString().Trim() != null && excelTable.Rows[k][7].ToString().Trim() != "")
{
sql = @"select * from TOrganization where org_code=@org_code";
- dynamicParams.Add("@org_code", excelTable[1].Rows[k][7].ToString().Trim());
+ dynamicParams.Add("@org_code", excelTable.Rows[k][7].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[1].Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable.Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
- if (excelTable[1].Rows[k][9].ToString().Trim() != null && excelTable[1].Rows[k][9].ToString().Trim() != "")
- {
- sql = @"select torg_code from TGroup where group_code=@group_code";
- dynamicParams.Add("@group_code", excelTable[1].Rows[k][9].ToString().Trim());
- dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt != null && dt.Rows.Count>0)
- {
- if (dt.Rows[0]["torg_code"].ToString()!= excelTable[1].Rows[k][7].ToString().Trim())
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{鐢ㄦ埛缁勭紪鐮亇";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缁勭紪鐮亇瀛楁" + excelTable[1].Rows[k][9].ToString().Trim() + " 涓嶆槸缁勭粐缂栫爜:" + excelTable[1].Rows[k][7].ToString().Trim() + "涓嬬殑鐢ㄦ埛缁�";
- list.Add(erro);
- } }
- }
- }
- //鍒ゆ柇瀛愯〃缁勭粐缂栫爜涓嶅瓨鍦ㄤ簬涓昏〃缁勭粐缂栫爜涓殑鏁版嵁
- var dt2 = 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> listRow2 = dt2.ToList();
- if (listRow2.Count > 0)
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{缁勭粐缂栫爜}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁涓湁鍊煎湪鐝粍琛�:{缁勭粐缂栫爜}涓笉瀛樺湪";
- 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)
{
@@ -1980,7 +1871,7 @@
{
StuCode = "200";
message = "鏁版嵁楠岃瘉鎴愬姛";
- count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+ count = excelTable.Rows.Count;
}
return list;
}
@@ -3233,41 +3124,12 @@
try
{
list.Clear();
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToTableList(FileCode);
- //瀵煎叆鐝粍
- for (int k = 0; k < excelTable[0].Rows.Count; k++)
- {
- sql = @"select * from TGroup where group_code=@group_code";
- dynamicParams.Add("@group_code", excelTable[0].Rows[k][2].ToString().Trim());
- dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count > 0)
- {
- continue;
- }
- else
- {
- sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code)
- values(@group_code,@group_name,@description,@Operator,@CreateDate,@torg_code)";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- group_code = excelTable[0].Rows[k][2].ToString().Trim(),
- group_name = excelTable[0].Rows[k][3].ToString().Trim(),
- description = excelTable[0].Rows[k][4].ToString().Trim(),
- CreateDate = DateTime.Now.ToString(),
- Operator = User,
- torg_code= excelTable[0].Rows[k][1].ToString().Trim()
- }
- });
- }
- }
+ DataTable excelTable = new DataTable();
+ excelTable = ImportExcel.ExcelToTable(FileCode);
//瀵煎叆鐢ㄦ埛
- for (int i = 0; i < excelTable[1].Rows.Count; i++)
+ for (int i = 0; i < excelTable.Rows.Count; i++)
{
- if (excelTable[1].Rows[i][3].ToString().Trim() == "鍦ㄨ亴")
+ if (excelTable.Rows[i][3].ToString().Trim() == "鍦ㄨ亴")
{
Enable = "Y";
}
@@ -3276,7 +3138,7 @@
Enable = "N";
}
//宸ヨ祫绫诲瀷
- switch (excelTable[1].Rows[i][8].ToString().Trim())
+ switch (excelTable.Rows[i][8].ToString().Trim())
{
case "璁′欢鍒�":
WageType = "2";
@@ -3288,7 +3150,7 @@
break;
}
sql = @"select * from TUser where usercode=@usercode";
- dynamicParams.Add("@usercode", excelTable[1].Rows[i][1].ToString().Trim());
+ dynamicParams.Add("@usercode", excelTable.Rows[i][1].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
@@ -3301,17 +3163,17 @@
str = sql,
parm = new
{
- UserCode = excelTable[1].Rows[i][1].ToString().Trim(),
- UserName = excelTable[1].Rows[i][2].ToString().Trim(),
- password = excelTable[1].Rows[i][4].ToString().Trim(),
+ UserCode = excelTable.Rows[i][1].ToString().Trim(),
+ UserName = excelTable.Rows[i][2].ToString().Trim(),
+ password = excelTable.Rows[i][4].ToString().Trim(),
Enable = Enable,
- Mobile = excelTable[1].Rows[i][5].ToString().Trim(),
+ Mobile = excelTable.Rows[i][5].ToString().Trim(),
CreateDate = DateTime.Now.ToString(),
- Email = excelTable[1].Rows[i][6].ToString().Trim(),
+ Email = excelTable.Rows[i][6].ToString().Trim(),
Operator = User,
- StuOrg = excelTable[1].Rows[i][7].ToString().Trim(),
+ StuOrg = excelTable.Rows[i][7].ToString().Trim(),
wagetype = WageType,
- usergroup_code = excelTable[1].Rows[i][9].ToString().Trim()
+ usergroup_code = excelTable.Rows[i][9].ToString().Trim()
}
});
}
--
Gitblit v1.9.3