1.用户新增、导入增加薪资属性字段 2.存货增加字段： priuserdefnvc1, --客户名称 priuserdefnvc6, --客户编码 ...

yl

2024-12-20 d777b62b3e5744650e1de55157a4f0faf12f16c2

 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分割转string[] 
                    string[] postcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][8].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                    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分割转string[] 
                    string[] rolecode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][9].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                    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分割转string[] 
                    string[] usergroupcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][10].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                    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()