调整仓库管理显示页面

yuyou_x

2024-02-05 1fb30a418afed6f1ff0d88c63d896ea73941e080

调整仓库管理显示页面

 HTML/views/WareHouseSetting/Area.html

@@ -196,13 +196,17 @@
                                field: 'WareHouseName',
                                title: '所属仓库',
                                width: 120,
                                align: 'center'
                                align: 'center',
                                templet: function(d) {

                                    return d.WareHouseNo + '-' + d.WareHouseName;
                                }
                                
                            }, {
                                field: 'AreaNo',
                                title: '区域编号',
                                width: 100,
                                align: 'center'
                                align: 'center',
                                
                            }, {
                                field: 'AreaName',

 HTML/views/WareHouseSetting/Locate.html

@@ -322,17 +322,29 @@
                            title: '所属仓库',
                            align: 'center',
                            width: 140,
                            fixed: 'left'
                            fixed: 'left',
                            templet: function(d) {

                                return d.WareHouseNo + '-' + d.WareHouseName;
                            }
                        }, {
                            field: 'RoadwayNo',
                            title: '所属巷道',
                            align: 'center',
                            width: 130,
                            templet: function(d) {

                                return d.RoadwayNo + '-' + d.RoadwayName;
                            }
                        }, {
                            field: 'AreaName',
                            title: '所属区域',
                            align: 'center',
                            width: 130,
                            templet: function(d) {

                                return d.AreaNo + '-' + d.AreaName;
                            }
                        }, {
                            field: 'LocatNo',
                            title: '储位编码',

 HTML/views/WareHouseSetting/Roadway.html

@@ -190,7 +190,11 @@
                                field: 'WareHouseName',
                                title: '所属仓库',
                                width: 120,
                                align: 'center'
                                align: 'center',
                                templet: function(d) {

                                    return d.WareHouseNo + '-' + d.WareHouseName;
                                }
                                
                            }, {
                                field: 'RoadwayNo',

 Wms/Model/ModelDto/SysDto/LocatDto.cs

@@ -19,6 +19,13 @@
        /// Default:
        /// Nullable:False
        /// </summary>           
        public string WareHouseNo { get; set; }

        /// <summary>
        /// 所属仓库
        /// Default:
        /// Nullable:False
        /// </summary>           
        public string WareHouseName { get; set; }

        /// <summary>
@@ -29,6 +36,20 @@
        public string RoadwayNo { get; set; }

        /// <summary>
        /// 所属巷道
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string RoadwayName { get; set; }

        /// <summary>
        /// 所属区域
        /// Default:
        /// Nullable:False
        /// </summary>           
        public string AreaNo { get; set; }

        /// <summary>
        /// 所属区域
        /// Default:
        /// Nullable:False

 Wms/WMS.BLL/SysServer/StorageLocatServer.cs

@@ -62,6 +62,7 @@
                var data = LocatRst.GetAllByOrderPageAsync(item, limit, page,out int counts)
                    .Includes(x => x.WareHouseInfo)
                    .Includes(x => x.AreaInfo)
                    .Includes(x => x.RoadwayInfo)
                    .Includes(x => x.TemperatureInfo)
                    .Includes(x => x.CreateUserInfo)
                    .Includes(x => x.UpdateUserInfo).ToList();
@@ -70,8 +71,11 @@
                {
                    Id = m.Id,
                    LocatNo = m.LocatNo,
                    WareHouseNo = m.WareHouseNo,
                    WareHouseName = m.WareHouseInfo == null ? "" : m.WareHouseInfo.WareHouseName,
                    RoadwayNo = m.RoadwayNo,
                    RoadwayName = m.RoadwayInfo == null ? "" : m.RoadwayInfo.RoadwayName,
                    AreaNo = m.AreaNo,
                    AreaName = m.AreaInfo == null ? "" : m.AreaInfo.AreaName,
                    Status = m.Status,
                    StatusName = GetStatus(m.Status),

 Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs

@@ -53,6 +53,7 @@
                    Id = m.Id,
                    RoadwayNo = m.RoadwayNo,
                    RoadwayName = m.RoadwayName,
                    WareHouseNo = m.WareHouseNo,
                    WareHouseName = m.WareHouseInfo == null ? "" : m.WareHouseInfo.WareHouseName,
                    AreaNo = m.AreaNo,
                    Priority = m.Priority,

 Wms/WMS.Entity/SysEntity/SysStorageLocat.cs

@@ -119,6 +119,9 @@
        [Navigate(NavigateType.OneToOne, nameof(AreaNo), nameof(SysStorageArea.AreaNo))]
        public SysStorageArea AreaInfo { get; set; }

        [Navigate(NavigateType.OneToOne, nameof(RoadwayNo), nameof(SysStorageRoadway.RoadwayNo))]
        public SysStorageRoadway RoadwayInfo { get; set; }

        [Navigate(NavigateType.OneToOne, nameof(Temperature))]
        public SysDictionary TemperatureInfo { get; set; }