From b5eec4dc738e4abc20c652c041fa7b17ba0e636f Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期一, 19 二月 2024 09:37:46 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
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),
--
Gitblit v1.8.0