From fccd9966ddc9d3e1e0f02cc117f634bf3136067e Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 27 八月 2024 09:01:05 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
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 ecefa7d..7eaf41a 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -636,9 +636,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,
@@ -650,6 +651,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