From 88dd0bb81e2d4e6d560e7b62bbe0a9c141c84a41 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 20 九月 2025 16:21:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
index a0520ce..1c5336f 100644
--- a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
@@ -70,11 +70,12 @@
}
//鏌ヨ鎷ｈ揣鏄庣粏鏀爜璇︾粏淇℃伅
- public List<CompleteDetailDto> GetCompBoxInfoList(string boxNo, string boxNo3)
+ public List<CompleteDetailDto> GetCompBoxInfoList(string sONo, string boxNo, string boxNo3)
{
try
{
Expression<Func<BllCompleteDetail, bool>> item = Expressionable.Create<BllCompleteDetail>()
+ .AndIF(!string.IsNullOrWhiteSpace(sONo), it => it.SONo == sONo.Trim())
.AndIF(!string.IsNullOrWhiteSpace(boxNo), it => it.BoxNo == boxNo.Trim())
.AndIF(!string.IsNullOrWhiteSpace(boxNo3), it => it.BoxNo3.Contains(boxNo3.Trim()))
.ToExpression();
@@ -90,6 +91,7 @@
ExportAllotId = a.ExportAllotId,
BoxNo = a.BoxNo,
+ BoxNo2 = a.BoxNo2,
BoxNo3 = a.BoxNo3,
LotNo = a.LotNo,
LotText = a.LotText,
--
Gitblit v1.8.0