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/DLL/DAL/BasicSettingDAL.cs | 245 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 184 insertions(+), 61 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 092ece5..6433422 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -242,7 +242,7 @@
#endregion
#region [缁勭粐鏋舵瀯鍒犻櫎]
- public static ToMessage DeleteOrganization(int orgid,string orgcode)
+ public static ToMessage DeleteOrganization(int orgid, string orgcode)
{
var sql = "";
var cont = 0;
@@ -270,23 +270,23 @@
return mes;
}
sql = @"delete TOrganization where id=@orgid";
- dynamicParams.Add(@"orgid", orgid);
- cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
- {
- mes.code = "200";
- mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
- mes.data = null;
- }
- else
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
- mes.data = null;
- }
-
+ dynamicParams.Add(@"orgid", orgid);
+ cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+
}
catch (Exception e)
{
@@ -302,7 +302,7 @@
#region[鐢ㄦ埛娓呭崟鏁版嵁鏌ヨ]
- public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
+ public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -466,7 +466,7 @@
#endregion
#region[鐢ㄦ埛鎵�灞炵彮缁刔
- public static ToMessage UserGroup(string stu_torgcode,string description)
+ public static ToMessage UserGroup(string stu_torgcode, string description)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -673,7 +673,7 @@
#endregion
#region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ]
- public static ToMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
+ public static ToMessage UserAssociationRole(string usercode, string stu_torgcode, string description)
{
string sql = "";
string search = "";
@@ -707,7 +707,7 @@
where C.user_code=@usercode
) B
on A.roletype_code=B.roletype_code
- where A.is_delete='0' "+search;
+ where A.is_delete='0' " + search;
dynamicParams.Add("@usercode", usercode);
var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
for (int i = 0; i < data.Count; i++)
@@ -737,7 +737,7 @@
#endregion
#region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨]
- public static ToMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
+ public static ToMessage SaveUserAssoctRole(string usercode, string stu_torgcode, string description, List<RoleUserSubmit> json)
{
var sql = "";
List<object> list = new List<object>();
@@ -804,7 +804,7 @@
for (int j = 0; j < json[i].Data.Count; j++)
{
sql = @"insert into TUserRoleRelation(user_code,role_code,torg_code) values(@usercode,@role_code,@stu_torgcode)";
- list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode= stu_torgcode, role_code = json[i].Data[j] } });
+ list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode, role_code = json[i].Data[j] } });
}
}
@@ -914,7 +914,7 @@
#region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
- public static ToMessage UserGroupSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
+ public static ToMessage UserGroupSearch(string groupcode, string groupname, string stu_torgcode, string description, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -937,11 +937,21 @@
default:
break;
}
+ if (groupcode != "" && groupcode != null)
+ {
+ search += " and G.group_code like '%'+@groupcode+'%' ";
+ dynamicParams.Add("@groupcode", groupcode);
+ }
+ if (groupname != "" && groupname != null)
+ {
+ search += " and G.group_name like '%'+@groupname+'%' ";
+ dynamicParams.Add("@groupname", groupname);
+ }
var sql = @"select torg_code,parent.org_name,group_code,group_name,G.description
from TGroup G
left join TOrganization parent on G.torg_code=parent.org_code
left join TOrganization as child on parent.parent_id=child.id
- where G.is_delete<>'1' "+search;
+ where G.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -960,7 +970,7 @@
#endregion
#region[鐢ㄦ埛缁勬柊澧瀅
- public static ToMessage UserGroupAdd(List<StepDefect> json, string username)
+ public static ToMessage UserGroupAdd(string type, List<GroupUser> json, string username)
{
var sql = "";
List<object> list = new List<object>();
@@ -968,50 +978,125 @@
try
{
list.Clear();
- //寰幆鍐欏叆鐢ㄦ埛缁勮〃
- for (int i = 0; i < json.Count; i++)
+ if (type == "Add")
{
- var sql0 = @"select * from TGroup where group_code=@group_code and torg_code=@torg_code";
- dynamicParams.Add("@group_code", json[i].code);
- dynamicParams.Add("@torg_code", json[i].storg_code);
- var data = DapperHelper.selectdata(sql0, dynamicParams);
+ //鍒ゆ柇鐢ㄦ埛缁勭紪鐮佹槸鍚﹀敮涓�
+ sql = @"select * from TGroup where group_code=@group_code and torg_code=@torg_code";
+ dynamicParams.Add("@group_code", json[0].code);
+ dynamicParams.Add("@torg_code", json[0].storg_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.Message = "鎿嶄綔澶辫触,鐢ㄦ埛缁勭紪鐮侀噸澶�!";
mes.data = null;
return mes;
}
- sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code) values(@groupcode,@groupename,@description,@lm_user,@lm_date,@torg_code)";
+ else
+ {
+ //鍐欏叆鐢ㄦ埛缁勮〃
+ sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code) values(@groupcode,@groupename,@description,@lm_user,@lm_date,@torg_code)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ groupcode = json[0].code,
+ groupename = json[0].name,
+ description = json[0].flag,
+ lm_user = username,
+ lm_date = DateTime.Now.ToString(),
+ torg_code = json[0].storg_code
+ }
+ });
+ //鍐欏叆鐢ㄦ埛缁勫叧绯昏〃
+ for (int i = 0; i < json[0].children.Count; i++)
+ {
+ sql = @"insert into TGroup(group_code,user_code) values(@groupcode,@usercode)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ groupcode = json[0].code,
+ groupename = json[0].children[i].usercode
+ }
+ });
+ }
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ 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";
list.Add(new
{
str = sql,
parm = new
{
- groupcode = json[i].code,
- groupename = json[i].name,
- description = json[i].flag,
+ groupcode = json[0].code,
+ groupename = json[0].name,
+ description = json[0].flag,
lm_user = username,
lm_date = DateTime.Now.ToString(),
- torg_code = json[i].storg_code
+ torg_code = json[0].storg_code
}
});
- }
- bool aa = DapperHelper.DoTransaction(list);
- if (aa)
- {
- mes.code = "200";
- mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
- mes.data = null;
- }
- else
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
- mes.data = null;
+ //鍒犻櫎鐢ㄦ埛缁勫叧绯昏〃
+ sql = @"delete TGroupUser where group_code=@groupcode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ groupcode = json[0].code
+ }
+ });
+ //淇敼鐢ㄦ埛缁勫叧绯昏〃
+ for (int i = 0; i < json[0].children.Count; i++)
+ {
+ 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
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
}
}
catch (Exception e)
@@ -1034,14 +1119,15 @@
try
{
list.Clear();
- sql = @"select * from TUser where is_delete<>'1' and usergroup_code=@UserGrupCode";
+ //鍒ゆ柇褰撳墠鐢ㄦ埛缁勬槸鍚﹀瓨鍦ㄥ紑鎶ュ伐璁板綍
+ sql = @"select * from TK_Wrk_RecordSub where usergroup_code=@UserGrupCode";
dynamicParams.Add("@UserGrupCode", UserGrupCode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ョ敤鎴风粍涓嬫湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
+ mes.Message = "璇ョ敤鎴风粍宸茬粡鏈夋姤宸�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1075,12 +1161,49 @@
}
#endregion
+ #region[鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛榏
+ public static ToMessage GroupUserProject(string groupcode)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TGroupUser where group_code=@groupcode";
+ dynamicParams.Add("@groupcode", groupcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ return mes;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "璇ョ彮缁勪笅鏃犳寚瀹氱敤鎴�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
#region[瑙掕壊绫诲瀷鏌ヨ]
- public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
+ public static ToMessage RoleTypeSearch(string stu_torgcode, string description, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1157,7 +1280,7 @@
{
roletypecode = json[i].code,
roletypename = json[i].name,
- torg_code= json[i].flag
+ torg_code = json[i].flag
}
});
}
@@ -1238,7 +1361,7 @@
#endregion
#region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
- public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
+ public static ToMessage RoleTypeSelect(string stu_torgcode, string description)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1282,7 +1405,7 @@
#endregion
#region[瑙掕壊娓呭崟鏌ヨ]
- public static ToMessage RoleSearch(string stu_torgcode,string description,string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
+ public static ToMessage RoleSearch(string stu_torgcode, string description, string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1355,7 +1478,7 @@
#endregion
#region[瑙掕壊娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName,string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
+ public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName, string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
{
var dynamicParams = new DynamicParameters();
try
--
Gitblit v1.9.3