From 2f8843c8f3ff4cfdffcb7ef6fca333d3022f0f84 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 27 八月 2024 08:09:35 +0800
Subject: [PATCH] PDA平库出库和收货组托功能修改

---
 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 4978a4e..e53f0ac 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -625,9 +625,10 @@
                     .LeftJoin<BllArrivalNoticeDetail>((a, b) => a.ASNDetailNo == b.Id)
                     .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
                     .LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
-                    //.LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
+                    .LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
+                    .LeftJoin<SysStorageArea>((a, b, c, d, e,f) => e.AreaNo == f.AreaNo)
                     //.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)
-                    .Select((a, b, c, d) => new PalletBindDto()
+                    .Select((a, b, c, d,e,f) => new PalletBindDto()
                     {
                         Id = a.Id,
                         ASNNo = a.ASNNo,
@@ -639,6 +640,7 @@
                         LocatNo = a.LocatNo,
                         RoadwayNo = a.RoadwayNo,
                         WareHouseNo = a.WareHouseNo,
+                        WareHouseName = f.AreaName,
                         Qty = a.Qty,
                         FullQty = a.FullQty,
                         SamplingQty = a.SamplingQty,

--
Gitblit v1.8.0