From d777b62b3e5744650e1de55157a4f0faf12f16c2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 20 十二月 2024 16:07:49 +0800
Subject: [PATCH] 1.用户新增、导入增加薪资属性字段 2.存货增加字段： priuserdefnvc1, --客户名称 priuserdefnvc6, --客户编码 priuserdefnvc2, --对内名称 priuserdefnvc3, --CTP日期 priuserdefnvc4, --钢刀编号 priuserdefnvc5 --盒型
---
VueWebCoreApi/Tools/ImportExcelData.cs | 100 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 39 deletions(-)
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 5a7c185..334524d 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -140,7 +140,7 @@
return Message;
}
- else if (excelTable[0].Columns.Count != 10)
+ else if (excelTable[0].Columns.Count != 11)
{
code = "301";
Message = "鐢ㄦ埛娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -164,46 +164,52 @@
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*瀵嗙爜}";
return Message;
}
- else if (excelTable[0].Columns[3].ColumnName != "*鍦ㄨ亴鐘舵��")
+ else if (excelTable[0].Columns[3].ColumnName != "*钖祫绫诲瀷")
{
code = "301";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*鍦ㄨ亴鐘舵�亇";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*钖祫绫诲瀷}";
return Message;
}
- else if (excelTable[0].Columns[4].ColumnName != "鎵嬫満鍙�")
+ else if (excelTable[0].Columns[4].ColumnName != "*鍦ㄨ亴鐘舵��")
{
code = "301";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鎵嬫満鍙穧";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*鍦ㄨ亴鐘舵�亇";
return Message;
}
- else if (excelTable[0].Columns[5].ColumnName != "閭")
+ else if (excelTable[0].Columns[5].ColumnName != "鎵嬫満鍙�")
{
code = "301";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕閭}";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鎵嬫満鍙穧";
return Message;
}
- else if (excelTable[0].Columns[6].ColumnName != "*鎵�灞炵粍缁囩紪鐮�")
+ else if (excelTable[0].Columns[6].ColumnName != "閭")
{
code = "301";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕*鎵�灞炵粍缁囩紪鐮亇";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕閭}";
return Message;
}
- else if (excelTable[0].Columns[7].ColumnName != "鎵�灞炲矖浣嶇紪鐮�")
+ else if (excelTable[0].Columns[7].ColumnName != "*鎵�灞炵粍缁囩紪鐮�")
{
code = "301";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕鎵�灞炲矖浣嶇紪鐮亇";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕*鎵�灞炵粍缁囩紪鐮亇";
return Message;
}
- else if (excelTable[0].Columns[8].ColumnName != "鎵�灞炶鑹茬紪鐮�")
+ else if (excelTable[0].Columns[8].ColumnName != "鎵�灞炲矖浣嶇紪鐮�")
{
code = "301";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�9鍒楀簲涓簕鎵�灞炶鑹茬紪鐮亇";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�9鍒楀簲涓簕鎵�灞炲矖浣嶇紪鐮亇";
return Message;
}
- else if (excelTable[0].Columns[9].ColumnName != "鎵�灞炵彮缁勭紪鐮�")
+ else if (excelTable[0].Columns[9].ColumnName != "鎵�灞炶鑹茬紪鐮�")
{
code = "301";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�10鍒楀簲涓簕鎵�灞炵彮缁勭紪鐮亇";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�10鍒楀簲涓簕鎵�灞炶鑹茬紪鐮亇";
+ return Message;
+ }
+ else if (excelTable[0].Columns[10].ColumnName != "鎵�灞炵彮缁勭紪鐮�")
+ {
+ code = "301";
+ Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�11鍒楀簲涓簕鎵�灞炵彮缁勭紪鐮亇";
return Message;
}
else
@@ -2186,29 +2192,29 @@
list.Add(erro);
}
}
- if (excelTable[0].Rows[k][6].ToString().Trim() != null && excelTable[0].Rows[k][6].ToString().Trim() != "")
+ if (excelTable[0].Rows[k][7].ToString().Trim() != null && excelTable[0].Rows[k][7].ToString().Trim() != "")
{
sql = @"select * from TOrganization where torg_code=@torg_code";
- dynamicParams.Add("@torg_code", excelTable[0].Rows[k][6].ToString().Trim());
+ dynamicParams.Add("@torg_code", excelTable[0].Rows[k][7].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt == null || dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = (k + 1).ToString();
erro.ErrorField = "*缁勭粐缂栫爜";
- erro.ErrorCont = "鐢ㄦ埛琛�:*缁勭粐缂栫爜瀛楁" + excelTable[0].Rows[k][6].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:*缁勭粐缂栫爜瀛楁" + excelTable[0].Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
- if (excelTable[0].Rows[k][7].ToString().Trim() != null && excelTable[0].Rows[k][7].ToString().Trim() != "")
+ if (excelTable[0].Rows[k][8].ToString().Trim() != null && excelTable[0].Rows[k][8].ToString().Trim() != "")
{
- string[] postcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][7].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ string[] postcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][8].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
sql = @"select postcode from TPost where postcode in @postcode";
dynamicParams.Add("@postcode", postcode);
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt != null && dt.Rows.Count > 0)
{
- string[] values = excelTable[0].Rows[k][7].ToString().Trim().Split(',');
+ string[] values = excelTable[0].Rows[k][8].ToString().Trim().Split(',');
var unmatchedValues = values.Except(dt.AsEnumerable().Select(row => row.Field<string>("postcode")));
foreach (var value in unmatchedValues)
{
@@ -2224,19 +2230,19 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = (k + 1).ToString();
erro.ErrorField = "{鎵�灞炲矖浣嶇紪鐮亇";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鎵�灞炲矖浣嶇紪鐮亇瀛楁" + excelTable[0].Rows[k][7].ToString().Trim() + " 涓嶆槸鏈夋晥鐨勫矖浣嶇紪鐮�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鎵�灞炲矖浣嶇紪鐮亇瀛楁" + excelTable[0].Rows[k][8].ToString().Trim() + " 涓嶆槸鏈夋晥鐨勫矖浣嶇紪鐮�";
list.Add(erro);
}
}
- if (excelTable[0].Rows[k][8].ToString().Trim() != null && excelTable[0].Rows[k][8].ToString().Trim() != "")
+ if (excelTable[0].Rows[k][9].ToString().Trim() != null && excelTable[0].Rows[k][9].ToString().Trim() != "")
{
- string[] rolecode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][8].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ string[] rolecode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][9].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
sql = @"select rolecode from TRole where rolecode in @rolecode";
dynamicParams.Add("@rolecode", rolecode);
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt != null && dt.Rows.Count > 0)
{
- string[] values = excelTable[0].Rows[k][8].ToString().Trim().Split(',');
+ string[] values = excelTable[0].Rows[k][9].ToString().Trim().Split(',');
var unmatchedValues = values.Except(dt.AsEnumerable().Select(row => row.Field<string>("rolecode")));
foreach (var value in unmatchedValues)
{
@@ -2252,19 +2258,19 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = (k + 1).ToString();
erro.ErrorField = "{鎵�灞炶鑹茬紪鐮亇";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鎵�灞炶鑹茬紪鐮亇瀛楁" + excelTable[0].Rows[k][8].ToString().Trim() + " 涓嶆槸鏈夋晥鐨勮鑹茬紪鐮�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鎵�灞炶鑹茬紪鐮亇瀛楁" + excelTable[0].Rows[k][9].ToString().Trim() + " 涓嶆槸鏈夋晥鐨勮鑹茬紪鐮�";
list.Add(erro);
}
}
- if (excelTable[0].Rows[k][9].ToString().Trim() != null && excelTable[0].Rows[k][9].ToString().Trim() != "")
+ if (excelTable[0].Rows[k][10].ToString().Trim() != null && excelTable[0].Rows[k][10].ToString().Trim() != "")
{
- string[] usergroupcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][9].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ string[] usergroupcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][10].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
sql = @"select usergroupcode from TGroup where usergroupcode in @usergroupcode";
dynamicParams.Add("@usergroupcode", usergroupcode);
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt != null && dt.Rows.Count > 0)
{
- string[] values = excelTable[0].Rows[k][9].ToString().Trim().Split(',');
+ string[] values = excelTable[0].Rows[k][10].ToString().Trim().Split(',');
var unmatchedValues = values.Except(dt.AsEnumerable().Select(row => row.Field<string>("usergroupcode")));
foreach (var value in unmatchedValues)
{
@@ -2280,7 +2286,7 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = (k + 1).ToString();
erro.ErrorField = "{鎵�灞炵彮缁勭紪鐮亇";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鎵�灞炵彮缁勭紪鐮亇瀛楁" + excelTable[0].Rows[k][9].ToString().Trim() + " 涓嶆槸鏈夋晥鐨勭彮缁勭紪鐮�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鎵�灞炵彮缁勭紪鐮亇瀛楁" + excelTable[0].Rows[k][10].ToString().Trim() + " 涓嶆槸鏈夋晥鐨勭彮缁勭紪鐮�";
list.Add(erro);
}
}
@@ -4559,8 +4565,23 @@
//{
// continue;
//}
- sql = @"insert into TUser(usercode,username,password,status,mobile,email,storg_code,post_code,role_code,group_code,is_system_admin,lm_user,lm_date)
- values(@usercode,@username,@password,@status,@mobile,@email,@storg_code,@post_code,@role_code,@group_code,@is_system_admin,@lm_user,@lm_date)";
+ string Type = "";
+ switch (excelTable[0].Rows[i][3].ToString().Trim())
+ {
+ case "璁′欢":
+ Type = "S";
+ break;
+ case "璁℃椂":
+ Type = "T";
+ break;
+ case "鍥哄畾":
+ Type = "M";
+ break;
+ default:
+ break;
+ }
+ sql = @"insert into TUser(usercode,username,password,payrate,status,mobile,email,storg_code,post_code,role_code,group_code,is_system_admin,lm_user,lm_date)
+ values(@usercode,@username,@password,@payrate,@status,@mobile,@email,@storg_code,@post_code,@role_code,@group_code,@is_system_admin,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -4569,13 +4590,14 @@
usercode = excelTable[0].Rows[i][0].ToString().Trim(),
username = excelTable[0].Rows[i][1].ToString().Trim(),
password = excelTable[0].Rows[i][2].ToString().Trim(),
- status = excelTable[0].Rows[i][3].ToString().Trim(),
- mobile = excelTable[0].Rows[i][4].ToString().Trim(),
- email = excelTable[0].Rows[i][5].ToString().Trim(),
- storg_code = excelTable[0].Rows[i][6].ToString().Trim(),
- post_code = excelTable[0].Rows[i][7].ToString().Trim(),
- role_code = excelTable[0].Rows[i][8].ToString().Trim(),
- group_code = excelTable[0].Rows[i][9].ToString().Trim(),
+ payrate = Type,
+ status = excelTable[0].Rows[i][4].ToString().Trim(),
+ mobile = excelTable[0].Rows[i][5].ToString().Trim(),
+ email = excelTable[0].Rows[i][6].ToString().Trim(),
+ storg_code = excelTable[0].Rows[i][7].ToString().Trim(),
+ post_code = excelTable[0].Rows[i][8].ToString().Trim(),
+ role_code = excelTable[0].Rows[i][9].ToString().Trim(),
+ group_code = excelTable[0].Rows[i][10].ToString().Trim(),
is_system_admin = "N",
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
--
Gitblit v1.9.3