From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 118 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 6433422..2a2127d 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -330,7 +330,7 @@
}
if (UserName != "" && UserName != null)
{
- search += " and S.username like '%'+@UserName+'%' ";
+ search += " and u.username like '%'+@UserName+'%' ";
dynamicParams.Add("@UserName", UserName);
}
if (wagetype != "" && wagetype != null)
@@ -540,6 +540,8 @@
public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName, string Password, string Enable, string StuOrg, string groupcode, string wagetype, string Mobile, string Email, string Operator, string OperType)
{
var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ var sql = "";
try
{
if (OperType == "Add")
@@ -555,22 +557,41 @@
mes.data = null;
return mes;
}
-
- var sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype,usergroup_code)
+ //鍐欏叆鐢ㄦ埛琛�
+ sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype,usergroup_code)
values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype,@groupcode)";
- dynamicParams.Add("@UserCode", UserCode);
- dynamicParams.Add("@UserName", UserName);
- dynamicParams.Add("@password", Password);
- dynamicParams.Add("@Enable", Enable);
- dynamicParams.Add("@Mobile", Mobile);
- dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
- dynamicParams.Add("@Email", Email);
- dynamicParams.Add("@Operator", Operator);
- dynamicParams.Add("@StuOrg", StuOrg);
- dynamicParams.Add("@wagetype", wagetype);
- dynamicParams.Add("@groupcode", groupcode);
- int cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ UserCode = UserCode,
+ UserName = UserName,
+ password = Password,
+ Enable = Enable,
+ Mobile = Mobile,
+ CreateDate = DateTime.Now.ToString(),
+ Email = Email,
+ Operator = Operator,
+ StuOrg = StuOrg,
+ wagetype = wagetype,
+ groupcode = groupcode
+ }
+ });
+ //鍐欏叆鐢ㄦ埛鐝粍鍏宠仈琛�
+ sql = @"insert into TGroupUser(group_code,user_code)
+ values(@groupcode,@usercode)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ usercode = UserCode,
+ groupcode = groupcode
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
{
mes.code = "200";
mes.count = 0;
@@ -587,20 +608,39 @@
}
if (OperType == "Update")
{
- var sql = @"update TUser set username=@UserName,password=@password,enable=@Enable,mobile=@Mobile,lm_user=@Operator,email=@Email,stu_torgcode=@StuOrg,wagetype=@wagetype,usergroup_code=@groupcode,lm_date=@CreateDate where id=@UserId";
- dynamicParams.Add("@UserId", UserId);
- dynamicParams.Add("@UserName", UserName);
- dynamicParams.Add("@password", Password);
- dynamicParams.Add("@Enable", Enable);
- dynamicParams.Add("@Mobile", Mobile);
- dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
- dynamicParams.Add("@Email", Email);
- dynamicParams.Add("@Operator", Operator);
- dynamicParams.Add("@StuOrg", StuOrg);
- dynamicParams.Add("@wagetype", wagetype);
- dynamicParams.Add("@groupcode", groupcode);
- int cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
+ //淇敼鐢ㄦ埛琛�
+ sql = @"update TUser set username=@UserName,password=@password,enable=@Enable,mobile=@Mobile,lm_user=@Operator,email=@Email,stu_torgcode=@StuOrg,wagetype=@wagetype,usergroup_code=@groupcode,lm_date=@CreateDate where id=@UserId";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ UserId = UserId,
+ UserName = UserName,
+ password = Password,
+ Enable = Enable,
+ Mobile = Mobile,
+ CreateDate = DateTime.Now.ToString(),
+ Email = Email,
+ Operator = Operator,
+ StuOrg = StuOrg,
+ wagetype = wagetype,
+ groupcode = groupcode
+ }
+ });
+ //鏇存柊鐢ㄦ埛鐝粍鍏宠仈琛�
+ sql = @"update TGroupUser set group_code=@groupcode where user_code=@usercode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ usercode = UserCode,
+ groupcode = groupcode
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
{
mes.code = "200";
mes.count = 0;
@@ -640,6 +680,10 @@
dynamicParams.Add("@userid", userid);
var data = DapperHelper.selectdata(sql, dynamicParams);
+ //鍒犻櫎鐢ㄦ埛鐝粍鍏宠仈琛�
+ sql = @"delete TGroupUser where user_code=@usercode";
+ list.Add(new { str = sql, parm = new { usercode = data.Rows[0]["USERCODE"].ToString() } });
+ //鍒犻櫎鐢ㄦ埛瑙掕壊鍏宠仈琛�
sql = @"delete TUserRoleRelation where user_code=@usercode";
list.Add(new { str = sql, parm = new { usercode = data.Rows[0]["USERCODE"].ToString() } });
@@ -1013,14 +1057,14 @@
//鍐欏叆鐢ㄦ埛缁勫叧绯昏〃
for (int i = 0; i < json[0].children.Count; i++)
{
- sql = @"insert into TGroup(group_code,user_code) values(@groupcode,@usercode)";
+ sql = @"insert into TGroupUser(group_code,user_code) values(@groupcode,@usercode)";
list.Add(new
{
str = sql,
parm = new
{
groupcode = json[0].code,
- groupename = json[0].children[i].usercode
+ usercode = json[0].children[i].usercode
}
});
}
@@ -1044,7 +1088,7 @@
else
{
//淇敼鐢ㄦ埛缁勮〃
- sql = @"update TGroup see group_name=@,lm_user=@lm_user,lm_date=@lm_date,description=@description,torg_code=@torg_code where group_code=@groupcode";
+ sql = @"update TGroup set group_name=@groupename,lm_user=@lm_user,lm_date=@lm_date,description=@description,torg_code=@torg_code where group_code=@groupcode";
list.Add(new
{
str = sql,
@@ -1078,7 +1122,7 @@
parm = new
{
groupcode = json[0].code,
- groupename = json[0].children[i].usercode
+ usercode = json[0].children[i].usercode
}
});
}
@@ -1133,6 +1177,8 @@
}
sql = @"delete TGroup where group_code=@UserGrupCode";
list.Add(new { str = sql, parm = new { UserGrupCode = UserGrupCode } });
+ sql = @"delete TGroupUser where group_code=@UserGrupCode";
+ list.Add(new { str = sql, parm = new { UserGrupCode = UserGrupCode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -1168,7 +1214,9 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select * from TGroupUser where group_code=@groupcode";
+ sql = @"select U.usercode,U.username from TGroupUser GU
+ left join TUser U on GU.user_code=U.usercode
+ where GU.group_code=@groupcode";
dynamicParams.Add("@groupcode", groupcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
--
Gitblit v1.9.3