新增页面用户名显示

zhaowc

3 天以前 3b434cdc16b71dbc981b364d41a7337fa3f4d43c

新增页面用户名显示

 HTML/views/BaseSetting/Materials.html

@@ -36,8 +36,9 @@
                                <input type="text" id="SkuName" name="SkuName" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline">
                            <!-- 审核状态 -->
                        <!-- <div class="layui-inline">
                            
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 60px;">审核状态</label>
                                <div class="layui-input-inline">
@@ -48,9 +49,10 @@
                                    </select>
                                </div>
                            </div>
                        </div>
                        <div class="layui-inline">
                        </div> -->
                            <!-- 类型 -->
                        <!-- <div class="layui-inline">
                            
                            <label class="layui-form-label" style="width: 60px;">类型</label>
                                <div class="layui-input-inline">
                                <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
@@ -62,9 +64,9 @@
                                    <option value="4">中间品</option>
                                </select>
                            </div>
                        </div>
                        </div> -->
                        <!-- 是否受控 -->
                        <div class="layui-inline">
                        <!-- <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">是否受控</label>
                            <div class="layui-input-inline">
                                <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
@@ -73,9 +75,9 @@
                                    <option value="1">非受控</option>
                                </select>
                            </div>
                        </div>
                        </div> -->
                        <!-- 是否免检 -->
                        <div class="layui-inline">
                        <!-- <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">是否免检</label>
                            <div class="layui-input-inline">
                                <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
@@ -84,21 +86,22 @@
                                    <option value="1">是</option>
                                </select>
                            </div>
                        </div>
                        </div> -->
                        <!-- 存储环境 --> 
                        <div class="layui-inline">
                        <!-- <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">存储环境</label>
                            <div class="layui-input-inline">
                                <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
                                    <option value=""></option>
                                    <option value="0">常温</option>
                                    <option value="1">低温</option>
                                    <!-- <option value="3">干燥通风</option> -->
                                   
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline">
                        </div> -->
                            <!-- 物料类别 -->
                        <!-- <div class="layui-inline">
                            
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 60px;">物料类别</label>
                                <div class="layui-input-inline">
@@ -107,7 +110,7 @@
                                    </select>
                                </div>
                            </div>
                        </div>
                        </div> -->
                        <div class="layui-inline">
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
@@ -337,42 +340,42 @@
                            field: 'Standard',title: '物料规格',align: 'center',width: 130
                        }, 
                        
                        {
                            field: 'Type',title: '类型',align: 'center',templet: '#buttonType',width: 100
                        },
                        {
                            field: 'IsControlled',templet: '#buttonIsControlled',title: '是否受控',align: 'center',width: 100
                        }, 
                        {
                            field: 'IsInspect',title: '是否免检',align: 'center',templet: '#buttonIsInspect',width: 100
                        }, 
                        {
                            field: 'IsPasteCode',title: '是否贴标',align: 'center',templet: '#buttonIsPasteCode',width: 100
                        }, 
                        {
                            field: 'Origin',title: '来源',align: 'center',width: 200
                        }, 
                        // {
                        //     field: 'Type',title: '类型',align: 'center',templet: '#buttonType',width: 100
                        // },
                        // {
                        //     field: 'IsControlled',templet: '#buttonIsControlled',title: '是否受控',align: 'center',width: 100
                        // }, 
                        // {
                        //     field: 'IsInspect',title: '是否免检',align: 'center',templet: '#buttonIsInspect',width: 100
                        // }, 
                        // {
                        //     field: 'IsPasteCode',title: '是否贴标',align: 'center',templet: '#buttonIsPasteCode',width: 100
                        // }, 
                        // {
                        //     field: 'Origin',title: '来源',align: 'center',width: 200
                        // }, 
                        {
                            field: 'UnitName',title: '单位',align: 'center',width: 100
                        },
                        {
                            field: 'PackagName',title: '包装',align: 'center',width: 100
                        },
                        {
                            field: 'Environment',title: '存储环境',align: 'center',templet: '#buttonEnvironment',width: 120
                        },
                        {
                            field: 'CategoryName',title: '物料类别',align: 'center',width: 120
                        },
                        // {
                        //     field: 'PackagName',title: '包装',align: 'center',width: 100
                        // },
                        // {
                        //     field: 'Environment',title: '存储环境',align: 'center',templet: '#buttonEnvironment',width: 120
                        // },
                        // {
                        //     field: 'CategoryName',title: '物料类别',align: 'center',width: 120
                        // },
                        {
                            field: 'Weight',title: '理论重量',align: 'center',width: 135
                        }, 
                        {
                            field: 'Warranty',title: '保质期(天)',align: 'center',width: 140
                        }, 
                        {
                            field: 'UnpackWarranty',title: '拆包效期(天)',align: 'center',width: 140
                        },
                        // {
                        //     field: 'UnpackWarranty',title: '拆包效期(天)',align: 'center',width: 140
                        // },
                        
                        {
                            field: 'AdventTime',title: '临期(天)',align: 'center',width: 140
@@ -421,7 +424,7 @@
                                title: '添加物料信息',
                                content: 'MaterialsForm.html',
                                maxmin: true,
                                area: ['640px', '746px'],
                                area: ['640px', '450px'],
                                btn: ['确定', '取消'],
                                yes: function(index, layero) {
                                    var iframeWindow = window['layui-layer-iframe' + index],
@@ -603,7 +606,7 @@
                            title: '编辑物料信息',
                            content: 'MaterialsForm.html?id=' + cusId,
                            maxmin: true,
                            area: ['640px', '746px'],
                            area: ['640px', '450px'],
                            btn: ['确定', '取消'],
                            yes: function(index, layero) {
                                var iframeWindow = window['layui-layer-iframe' + index],

 HTML/views/BaseSetting/MaterialsForm.html

@@ -55,16 +55,15 @@
                        class="layui-input">
                </div>
            </div>
            <div class="layui-inline" id="IsPasteCodeshow">
            <!-- <div class="layui-inline" id="IsPasteCodeshow">
                <label class="layui-form-label">是否贴标</label>
                <div class="layui-input-block" style="width: 182px;">
                    <select name="IsPasteCode" id="IsPasteCode" lay-verify="" lay-verify="" lay-search>
                        <!-- <option value=""></option> -->
                        <option value="1">是</option>
                        <option value="0">否</option>
                    </select>
                </div>
            </div>
            </div> -->
            <!-- 添加不显示 -->
            <!-- <div class="layui-inline" id="Auditishow">
                <label class="layui-form-label">审核状态</label>
@@ -77,8 +76,8 @@
                    </select>
                </div>
            </div> -->
        </div>
        <div class="layui-form-item">
		
        <!-- <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">类型</label>
                <div class="layui-input-block" style="width: 182px;">
@@ -96,7 +95,6 @@
                <label class="layui-form-label">是否受控</label>
                <div class="layui-input-block" style="width: 182px;">
                    <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
                        <!-- <option value=""></option> -->
                        <option value="0">受控</option>
                        <option value="1">非受控</option>
                    </select>
@@ -106,7 +104,6 @@
                <label class="layui-form-label">是否免检</label>
                <div class="layui-input-block" style="width: 182px;">
                    <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
                        <!-- <option value=""></option> -->
                        <option value="0">否</option>
                        <option value="1">是</option>
                    </select>
@@ -120,8 +117,8 @@
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <!-- 单位 -->
        <div class="layui-form-item">-->
            <!-- 单位 
            <div class="layui-inline">
                <label class="layui-form-label">单位</label>
                <div class="layui-input-block" style="width: 182px;">
@@ -130,7 +127,7 @@
                    </select>
                </div>
            </div>
            <!-- 包装 -->
             包装 
            <div class="layui-inline">
                <label class="layui-form-label">包装 <strong style="color: red;font-size: 18px;">*</strong></label>
                <div class="layui-input-block" style="width: 182px;">
@@ -139,8 +136,8 @@
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
        </div> -->
        <!-- <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">存储环境</label>
                <div class="layui-input-block" style="width: 182px;">
@@ -148,7 +145,6 @@
                        <option value=""></option>
                        <option value="0">常温</option>
                        <option value="1">低温</option>
                        <!-- <option value="3">干燥通风</option> -->
                    </select>
                </div>
            </div>
@@ -159,8 +155,7 @@
                        lay-verify="" autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>
        <div class="layui-form-item">
        </div> -->
            <div class="layui-inline">
                <label class="layui-form-label" style="width: 70px;">保质期(天)</label>
                <div class="layui-input-block" style="width: 182px;">
@@ -168,12 +163,12 @@
                        lay-verify="" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-inline">
            <!-- <div class="layui-inline">
                <label class="layui-form-label" style="width: 70px;">拆包效期(天)</label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="UnpackWarranty" placeholder="请输入拆包效期" lay-verify="" autocomplete="off" class="layui-input">
                </div>
            </div> 
            </div>  -->
            <!-- <div class="layui-inline">
                <label class="layui-form-label">理论单价</label>
                <div class="layui-input-block" style="width: 182px;">

 HTML/views/HouseWithinSetting/HopperTransport.html

@@ -50,7 +50,7 @@
                        <ul class="layui-tab-title" id="tab">
                            <li class="layui-this">叫料</li>
                            <li>叫车</li>
                            <li>车间到车间</li>
                            <!-- <li>车间到车间</li> -->
                        </ul>
 
                        <div class="layui-tab-content">

 HTML/views/WareHouseSetting/Locate.html

@@ -40,14 +40,14 @@
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline">
                        <!-- <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">所属巷道</label>
                            <div class="layui-input-inline">
                                <select name="RoadwayNo" id="RoadwayNo" lay-filter="getRoadwayNo" lay-search>
                                    <option value=""></option>
                                </select>
                            </div>
                        </div>
                        </div> -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">储位状态</label>
                            <div class="layui-input-inline">
@@ -195,7 +195,7 @@
                            title: '编辑储位状态集合',
                            content: 'LocateFrom.html?WareHouseNo='+WareNo,
                            maxmin: true,
                            area: ['560px', '510px'],
                            area: ['560px', '410px'],
                            btn: ['确定', '取消'],
                            yes: function (index, layero) {
                                var iframeWindow = window['layui-layer-iframe' + index],
@@ -454,7 +454,7 @@
                            title: '储位信息管理',
                            content: 'LocateFrom.html?id=' + id,
                            maxmin: true,
                            area: ['560px', '510px'],
                            area: ['560px', '410px'],
                            btn: ['确定', '取消'],
                            yes: function(index, layero) {
                                var iframeWindow = window['layui-layer-iframe' + index],

 HTML/views/WareHouseSetting/LocateFrom.html

@@ -78,12 +78,12 @@
            </div>

            <div class="layui-form-item">
                <label class="layui-form-label">所属巷道</label>
                <!-- <label class="layui-form-label">所属巷道</label>
                <div class="layui-input-inline">
                    <select name="RoadwayNo" id="RoadwayNo" lay-filter="getRoadwayNo" lay-search disabled="">
                        <option value=""></option>
                    </select>
                </div>
                </div> -->
                
                <label class="layui-form-label">&emsp;&emsp;储层</label>
                <div class="layui-input-inline">
@@ -93,7 +93,7 @@
            </div>

            
            <div class="layui-form-item"> 
            <!-- <div class="layui-form-item"> 
                <label class="layui-form-label">储位高度</label>
                <div class="layui-input-inline">
                    <input type="text" id="Height" name="Height" placeholder="储位高度···" autocomplete="off"
@@ -114,7 +114,7 @@
                    </select>
                </div>
                 
            </div>
            </div> -->
            <!--  -->
            <div class="layui-form-item layui-hide">
                <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit"

 HTML/views/index.html

@@ -30,7 +30,13 @@
                    </ul>
                    <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">

                        <li class="layui-nav-item layui-hide layui-show-md-inline-block">
                            <!-- <a href="javascript:;">
                              <class="layui-nav-img"> -->
                                <a id="username2">个人信息</a>
                            <i class="layui-icon layui-icon-down layui-nav-more"></i></a>
                        
                        </li>
                        <li class="layui-nav-item layui-hide-xs" lay-unselect>
                            <a href="javascript:;" layadmin-event="theme">
                                <i class="layui-icon layui-icon-theme"></i>
@@ -224,6 +230,23 @@
                        });
                    } 
                });                    

                var name = localStorage.getItem('keyUserName');
                var param = {
                    username: name
                    };
                sendData(IP + "/Basis/GetUserrealname", param, 'get', function(res) {
                    if (res.code == 0) { //成功
                        $("#username2").html("当前用户："+res.data);
                    } else { //不成功
                        layer.msg('获取当前登录人用户名信息失败', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function() {
                            //回调
                        });
                    }
                });				
                // var dataList;
                //     sendData(IP + "/IndexEchar/ImportTaskDayList", param, 'post', function(res) {
                //         if (res.code == 0) { //成功

 Wms/WMS.DAL/SysInfrastructure/UserInforRepository.cs

@@ -162,6 +162,18 @@
        }

        /// <summary>
        /// 获取用户姓名
        /// </summary>
        /// <param username="username"></param>
        /// <returns></returns>
        public string GetUserRealname(string username)
        {

            string name = Db.Queryable<SysUserInfor>().First(w => w.UserName == username && w.IsDel == "0").RealName;
            return name;
        }

        /// <summary>
        /// 修改用户密码
        /// </summary>
        /// <param name="pwdOld">原密码</param>

 Wms/WMS.IDAL/ISysInterface/IUserInforRepository.cs

@@ -50,6 +50,12 @@
        /// <returns></returns>
        Task<int> UpdateUserinfo(SysUserInfor userlist);

        /// <summary>
        /// 获取用户姓名
        /// </summary>
        /// <param name="username"></param>
        /// <returns></returns>
        string GetUserRealname(string username);

        /// <summary>
        /// 根据id获取用户信息列表

 Wms/Wms/Controllers/BasisController.cs

@@ -20,6 +20,7 @@
using System.Security.Cryptography;
using System.Data;
using Model.ModelDto.LogDto;
using WMS.IDAL.ISysInterface;

namespace Wms.Controllers
{
@@ -45,6 +46,8 @@
        private readonly IInterfaceServer _interface;//接口管理
        private readonly IOperationSysServer _operation; //操作日志
        private readonly IRoleWareHouseServer _roleWareSvs; //操作日志

        private readonly IUserInforRepository _userInforRepository;
        /// <summary>
        /// 构造函数
        /// </summary>
@@ -59,11 +62,12 @@
        /// <param name="department">部门</param>
        /// <param name="setting">功能设定</param>
        /// <param name="operation">操作日志</param>
        public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, IInterfaceServer interfaceS, IOperationSysServer operation, IRoleWareHouseServer roleWareSvs)
        public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, IUserInforRepository userInfor, IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, IInterfaceServer interfaceS, IOperationSysServer operation, IRoleWareHouseServer roleWareSvs)
        {
            _customerSvc = customerSvc;//客户Svc
            _logisticsSvc = logisticsSvc;//物流Svc
            _userInforServer = userInforServer;//用户
            _userInforRepository = userInfor;
            _rolesServer = rolesServer;//角色
            _roleRightServer = roleRightServer;//角色权限
            _rBACServer = rBACServer;//RBAC
@@ -118,7 +122,22 @@
                msg = "成功"
            });
        }

        /// <summary>
        /// 获取用户姓名列表
        /// </summary>
        /// <param name="id">用户id</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetUserrealname(string username)
        {
            string userinfo = _userInforRepository.GetUserRealname(username);
            return Ok(new
            {
                data = userinfo,
                code = 0,
                msg = "成功"
            });
        }

        /// <summary>
        /// 新增用户信息

 Wms/Wms/appsettings.json

@@ -12,8 +12,8 @@
    //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
    //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
    //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC37;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=.;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;"
    "ConnectionString": "Data Source=192.168.10.201\\WMSSQLSERVER;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;"
    "ConnectionString": "Server=.;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;"
    //"ConnectionString": "Data Source=192.168.10.201\\WMSSQLSERVER;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;"
    //"ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC23-2;User Id=sa;Password=admin2023@;" // SqlServer 库连接字符串
    //"ConnectionString": "Server=172.16.105.10;Database=WMS_JC23-2;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=172.16.105.2;Database=WMS_JC23-2;User ID=sa;Password=boxline@2024;Integrated Security=False;"