From 1a29ad0fea9932f3d0bb56c939ccc32c877a34d8 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 19 二月 2024 16:08:59 +0800
Subject: [PATCH] 1

---
 Wms/WMS.BLL/SysServer/StorageLocatServer.cs |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 46abd4e..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),
@@ -631,7 +635,7 @@
         {
             try
             {
-                string str = "select RoadwayNo,RoadwayName from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
+                string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
                 
                 List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
                 {

--
Gitblit v1.8.0