1.生产开报工，修改开工数量功能 2.车间看板，左上产线加工任务增加开工数量字段 3.修改用户清单，用户名称查询无数据问题

yl

2023-11-20 8b3020c92010076e03d0314f1719083444063626

 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() } });