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/Controllers/BasicSettingController.cs | 3
VueWebCoreApi/DLL/DAL/ProductModelDAL.cs | 2
VueWebCoreApi/wwwroot/Excel/人员管理.xls | 0
VueWebCoreApi/Tools/RedisCommon.cs | 2
VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs | 4
VueWebCoreApi/Tools/ImportExcelData.cs | 100 ++++++++++++++++++++-------------
VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs | 12 ++-
VueWebCoreApi/Startup.cs | 2
VueWebCoreApi/appsettings.json | 6 +-
9 files changed, 78 insertions(+), 53 deletions(-)
diff --git a/VueWebCoreApi/Controllers/BasicSettingController.cs b/VueWebCoreApi/Controllers/BasicSettingController.cs
index 004da7c..f729bca 100644
--- a/VueWebCoreApi/Controllers/BasicSettingController.cs
+++ b/VueWebCoreApi/Controllers/BasicSettingController.cs
@@ -190,6 +190,7 @@
string usercode = obj["usercode"].ToString(); //鐢ㄦ埛缂栫爜
string username = obj["username"].ToString(); //鐢ㄦ埛鍚嶇О
string password = obj["password"].ToString();//鐢ㄦ埛瀵嗙爜
+ string payrate = obj["payrate"].ToString();//钖祫灞炴��
string mobile = obj["mobile"].ToString();//鎵嬫満鍙�
string email = obj["email"].ToString();//閭
string storg_code = obj["storg_code"].ToString();//鎵�灞炵粍缁�
@@ -198,7 +199,7 @@
string role_code = obj["role_code"].ToString();//瑙掕壊
string group_code = obj["group_code"].ToString();//鐝粍
string opertype = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateUserSave(usercode, username, password, mobile, email, storg_code, status, post_code, role_code, group_code, opertype, us);
+ mes = BasicSettingBLL.AddUpdateUserSave(usercode, username, password, payrate,mobile, email, storg_code, status, post_code, role_code, group_code, opertype, us);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs b/VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs
index 25d9447..e209217 100644
--- a/VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs
@@ -100,9 +100,9 @@
#endregion
#region[鐢ㄦ埛淇℃伅鏂板缂栬緫]
- public static ToMessage AddUpdateUserSave(string usercode, string username, string password, string mobile, string email, string storg_code, string status, string post_code, string role_code,string group_code, string opertype, User us)
+ public static ToMessage AddUpdateUserSave(string usercode, string username, string password,string payrate, string mobile, string email, string storg_code, string status, string post_code, string role_code,string group_code, string opertype, User us)
{
- return BasicSettingDAL.AddUpdateUserSave(usercode, username, password, mobile, email, storg_code, status, post_code, role_code, group_code, opertype, us);
+ return BasicSettingDAL.AddUpdateUserSave(usercode, username, password, payrate, mobile, email, storg_code, status, post_code, role_code, group_code, opertype, us);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
index 1cdffc9..ef10ef2 100644
--- a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
@@ -757,7 +757,7 @@
select torg_code, torg_name, parent_id
from TOrganization
where status='Y' " + search0 + " union all select T.torg_code, T.torg_name, T.parent_id from TOrganization T inner join CTE ON T.parent_id = CTE.torg_code)";
- var sql = @"SELECT distinct U.usercode,U.username,U.password,U.mobile,U.email,U.status,U.storg_code as storg_code,T.torg_name as storg_name,T.parent_id,
+ var sql = @"SELECT distinct U.usercode,U.username,U.password,U.payrate,U.mobile,U.email,U.status,U.storg_code as storg_code,T.torg_name as storg_name,T.parent_id,
U.role_code,
STUFF((SELECT ',' + R.rolename
FROM TRole R
@@ -797,7 +797,7 @@
#endregion
#region[鐢ㄦ埛淇℃伅鏂板缂栬緫]
- public static ToMessage AddUpdateUserSave(string usercode, string username, string password, string mobile, string email, string storg_code, string status, string post_code, string role_code, string group_code, string opertype, User us)
+ public static ToMessage AddUpdateUserSave(string usercode, string username, string password,string payrate, string mobile, string email, string storg_code, string status, string post_code, string role_code, string group_code, string opertype, User us)
{
string sql = "";
List<object> list = new List<object>();
@@ -866,8 +866,8 @@
mes.data = null;
return mes;
}
- sql = @"insert into TUser(usercode,username,password,mobile,email,status,storg_code,role_code,role_datapermissions,post_code,group_code,is_system_admin,lm_user,lm_date)
- values(@usercode,@username,@password,@mobile,@email,@status,@storg_code,@role_code,@role_datapermissions,@post_code,@group_code,@is_system_admin,@lm_user,@lm_date)";
+ sql = @"insert into TUser(usercode,username,password,payrate,mobile,email,status,storg_code,role_code,role_datapermissions,post_code,group_code,is_system_admin,lm_user,lm_date)
+ values(@usercode,@username,@password,@payrate,@mobile,@email,@status,@storg_code,@role_code,@role_datapermissions,@post_code,@group_code,@is_system_admin,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -876,6 +876,7 @@
usercode = usercode,
username = username,
password = password,
+ payrate= payrate,
mobile = mobile,
email = email,
status = status,
@@ -910,7 +911,7 @@
if (opertype == "Update")
{
- sql = @"update TUser set username=@username,password=@password,mobile=@mobile,email=@email,status=@status,storg_code=@storg_code,
+ sql = @"update TUser set username=@username,password=@password,payrate=@payrate,mobile=@mobile,email=@email,status=@status,storg_code=@storg_code,
role_code=@role_code,role_datapermissions=@role_datapermissions,post_code=@post_code,group_code=@group_code,lm_user=@lm_user,lm_date=@lm_date
where usercode=@usercode";
list.Add(new
@@ -921,6 +922,7 @@
usercode = usercode,
username = username,
password = password,
+ payrate= payrate,
mobile = mobile,
email = email,
status = status,
diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index ac2ed95..180b3d3 100644
--- a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
@@ -763,7 +763,7 @@
M.idUnitByPurchase as idUnitByPurchasecode,P.name as idUnitByPurchasename,M.idUnitBySale as idUnitBySalecode,S.name as idUnitBySalename,
M.idunitbymanufacture as idunitbymanufacturecode,F.name as idunitbymanufacturename,M.idinventoryclass as idinventoryclasscode,C.name as idinventoryclassname,
M.isPurchase,M.isSale,M.isMadeSelf,M.isMaterial,M.isMadeRequest,M.idwarehouse as idwarehousecode,H.name as idwarehousename,M.lowQuantity,M.topQuantity,M.safeQuantity,
- M.status,U.username as lm_user,M.lm_date,M.data_sources,M.is_retdproc,M.default_route
+ M.status,U.username as lm_user,M.lm_date,M.data_sources,M.is_retdproc,M.default_route,M.priuserdefnvc1,M.priuserdefnvc2,M.priuserdefnvc3,M.priuserdefnvc4,M.priuserdefnvc5,M.priuserdefnvc6
from TMateriel_Info M
left join TUnit T on M.idunit=T.code
left join TUnit R on M.idSubUnitByReport=R.code
diff --git a/VueWebCoreApi/Startup.cs b/VueWebCoreApi/Startup.cs
index ee50aa3..4a41087 100644
--- a/VueWebCoreApi/Startup.cs
+++ b/VueWebCoreApi/Startup.cs
@@ -73,7 +73,7 @@
{
c.SwaggerDoc(version, new OpenApiInfo()
{
- Title = $"桥下工贸-MesApi文档:{version}",
+ Title = $"永康嘉持电器有限公司-MesApi文档:{version}",
Version = version,
Description = $"Panda.Sewerage : {version} ",
});
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()
diff --git a/VueWebCoreApi/Tools/RedisCommon.cs b/VueWebCoreApi/Tools/RedisCommon.cs
index ad51736..3ce53d2 100644
--- a/VueWebCoreApi/Tools/RedisCommon.cs
+++ b/VueWebCoreApi/Tools/RedisCommon.cs
@@ -17,7 +17,7 @@
private string _conn = RedisIpConnString+":"+RedisPortConnString;
- private int _db = 0;
+ private int _db = 1;
//榛樿缂撳瓨杩囨湡鏃堕棿鍗曚綅绉�
public int secondsTimeOut = Convert.ToInt32(RedisKeyTimeCont);
//闈欐�佸彉閲� 淇濊瘉鍚勬ā鍧椾娇鐢ㄧ殑鏄笉鍚屽疄渚嬬殑鐩稿悓閾炬帴
diff --git a/VueWebCoreApi/appsettings.json b/VueWebCoreApi/appsettings.json
index e725d23..94fce4a 100644
--- a/VueWebCoreApi/appsettings.json
+++ b/VueWebCoreApi/appsettings.json
@@ -9,13 +9,13 @@
"AllowedHosts": "*",
//鏈嶅姟鍣ㄧ幆澧�
"ConnectionStrings": {
- "DBServer": "Data Source=121.196.36.24,1533;Initial Catalog=vmes_qx;User ID=sa;Password=xkd@20230101;pooling=false",
+ "DBServer": "Data Source=121.196.36.24,1533;Initial Catalog=vmes_jc;User ID=sa;Password=xkd@20230101;pooling=false",
//浼佷笟缂栫爜
"CompanyCode": "000",
//浼佷笟鍚嶇О
- "CompanyName": "鏂板嚡杩鎶�鑲′唤鏈夐檺鍏徃",
+ "CompanyName": "姘稿悍鍢夋寔鐢靛櫒鏈夐檺鍏徃",
//redis浼佷笟閰嶇疆
- "Enterprise": "NewMES",
+ "Enterprise": "NewJCMES",
//redis鏁版嵁搴撻摼鎺ラ厤缃甶p
"RedisConnIp": "127.0.0.1",
//redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿
diff --git "a/VueWebCoreApi/wwwroot/Excel/\344\272\272\345\221\230\347\256\241\347\220\206.xls" "b/VueWebCoreApi/wwwroot/Excel/\344\272\272\345\221\230\347\256\241\347\220\206.xls"
index fdb1ed2..5c22835 100644
--- "a/VueWebCoreApi/wwwroot/Excel/\344\272\272\345\221\230\347\256\241\347\220\206.xls"
+++ "b/VueWebCoreApi/wwwroot/Excel/\344\272\272\345\221\230\347\256\241\347\220\206.xls"
Binary files differ
--
Gitblit v1.9.3