From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs"
index ed4c867..07bbbb5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs"
@@ -35,8 +35,8 @@
Customer = proOutOrderDetail.Customer,
PCode = proOutOrderDetail.PCode,
PVer = proOutOrderDetail.PVer,
- PLot = proOutOrderDetail.PLot,
- DateCode = proOutOrderDetail.DateCode,
+ PLot = proStockInfo.proStockInfoDetails.FirstOrDefault()?.LotNumber ?? "",
+ DateCode = proStockInfo.proStockInfoDetails.FirstOrDefault()?.DateCode ?? "",
StockId = proStockInfo.Id,
OrderQuantity = proOutOrderDetail.QtyPcs,
OriginalQuantity = proStockInfo.proStockInfoDetails.Sum(x => x.StockPcsQty),
@@ -77,5 +77,9 @@
return outProStockInfo;
}
+ public List<Dt_OutProStockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
+ {
+ return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
+ }
}
}
--
Gitblit v1.9.3