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/DLL/DAL/BasicSettingDAL.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
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,
--
Gitblit v1.9.3