From 1fb30a418afed6f1ff0d88c63d896ea73941e080 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 05 二月 2024 15:36:18 +0800
Subject: [PATCH] 调整仓库管理显示页面
---
Wms/WMS.Entity/SysEntity/SysStorageLocat.cs | 3 +++
HTML/views/WareHouseSetting/Roadway.html | 6 +++++-
Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs | 1 +
Wms/Model/ModelDto/SysDto/LocatDto.cs | 21 +++++++++++++++++++++
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 4 ++++
HTML/views/WareHouseSetting/Area.html | 8 ++++++--
HTML/views/WareHouseSetting/Locate.html | 14 +++++++++++++-
7 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index cba9006..0b2243b 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/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',
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 63b6472..e2adf60 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/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: '鍌ㄤ綅缂栫爜',
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index afa6f04..69a31db 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/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',
diff --git a/Wms/Model/ModelDto/SysDto/LocatDto.cs b/Wms/Model/ModelDto/SysDto/LocatDto.cs
index 0d2cfe4..aee8ed5 100644
--- a/Wms/Model/ModelDto/SysDto/LocatDto.cs
+++ b/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
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 302db35..c139dd7 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/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),
diff --git a/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs b/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs
index ac496ef..3c16a1d 100644
--- a/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs
+++ b/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,
diff --git a/Wms/WMS.Entity/SysEntity/SysStorageLocat.cs b/Wms/WMS.Entity/SysEntity/SysStorageLocat.cs
index faebbe4..f029304 100644
--- a/Wms/WMS.Entity/SysEntity/SysStorageLocat.cs
+++ b/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; }
--
Gitblit v1.8.0