From 25cb7cd50d12f48e93d6cde47420ca3458e9c47a Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期四, 12 六月 2025 21:39:43 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs | 67 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 23 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
index f4820b9..cba7d6c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
@@ -52,7 +52,10 @@
OriginalQuantity = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
StockId = item.Id,
- TaskNum = taskNum
+ TaskNum = taskNum,
+ ProductionDate = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).FirstOrDefault()?.ProductionDate,
+ EffectiveDate = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).FirstOrDefault()?.EffectiveDate
+
};
outStockLockInfos.Add(outStockLockInfo);
}
@@ -80,6 +83,8 @@
TaskNum = taskNum,
OrderQuantity = outboundOrderDetail.OrderQuantity,
Unit = outboundOrderDetail.Unit,
+ ProductionDate = outStock.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).FirstOrDefault()?.ProductionDate,
+ EffectiveDate = outStock.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).FirstOrDefault()?.EffectiveDate
};
return outStockLockInfo;
@@ -111,7 +116,10 @@
StockId = outStock.Id,
TaskNum = taskNum,
OrderQuantity = mesOutboundOrder.OrderQuantity,
- Unit = mesOutboundOrder.Unit
+ Unit = mesOutboundOrder.Unit,
+ ProductionDate = outStock.Details.Where(x => x.MaterielCode == mesOutboundOrder.MaterialCode).FirstOrDefault()?.ProductionDate,
+ EffectiveDate = outStock.Details.Where(x => x.MaterielCode == mesOutboundOrder.MaterialCode).FirstOrDefault()?.EffectiveDate
+
};
return outStockLockInfo;
@@ -124,32 +132,39 @@
/// <param name="assignQuantity"></param>
/// <param name="taskNum"></param>
/// <returns></returns>
- public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder,Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
+ public List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder, Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail, List<Dt_StockInfo> outStock, int? taskNum = null)
{
+ List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
+ foreach (var item in outStock)
{
- PalletCode = outStock.PalletCode,
- AssignQuantity = assignQuantity,
- MaterielCode = mesPPCutOutboundOrderDetail.MaterielCode,
- BatchNo = outStock.Details.FirstOrDefault()?.BatchNo ?? "",
- LocationCode = outStock.LocationCode,
- MaterielName = mesPPCutOutboundOrderDetail.MaterielName,
- OrderDetailId = mesPPCutOutboundOrderDetail.Id,
- OrderNo = mesPPCutOutboundOrder.OrderNo,
- OrderType = mesPPCutOutboundOrder.OrderType,
- OriginalQuantity = outStock.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
- Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
- StockId = outStock.Id,
- TaskNum = taskNum,
- OrderQuantity = mesPPCutOutboundOrderDetail.OrderQuantity,
- Unit = mesPPCutOutboundOrderDetail.Unit
- };
+ Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
+ {
+ PalletCode = item.PalletCode,
+ AssignQuantity = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.OutboundQuantity),
+ MaterielCode = mesPPCutOutboundOrderDetail.MaterielCode,
+ BatchNo = item.Details.FirstOrDefault().BatchNo,
+ LocationCode = item.LocationCode,
+ MaterielName = mesPPCutOutboundOrderDetail.MaterielName,
+ OrderDetailId = mesPPCutOutboundOrderDetail.Id,
+ OrderNo = mesPPCutOutboundOrder.OrderNo,
+ OrderType = mesPPCutOutboundOrder.OrderType,
+ OriginalQuantity = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
+ Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
+ StockId = item.Id,
+ TaskNum = taskNum,
+ OrderQuantity = mesPPCutOutboundOrderDetail.OrderQuantity,
+ Unit = mesPPCutOutboundOrderDetail.Unit,
+ ProductionDate = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).FirstOrDefault()?.ProductionDate,
+ EffectiveDate = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).FirstOrDefault()?.EffectiveDate
+ };
+ outStockLockInfos.Add(outStockLockInfo);
+ }
- return outStockLockInfo;
+ return outStockLockInfos;
}
- public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPOutboundOrder mesPPOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
+ public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPOutboundOrder mesPPOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
{
Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
@@ -168,7 +183,9 @@
StockId = outStock.Id,
TaskNum = taskNum,
OrderQuantity = mesPPOutboundOrder.OrderQuantity,
- Unit = mesPPOutboundOrder.Unit
+ Unit = mesPPOutboundOrder.Unit,
+ ProductionDate = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).FirstOrDefault()?.ProductionDate,
+ EffectiveDate = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).FirstOrDefault()?.EffectiveDate
};
return outStockLockInfo;
@@ -183,6 +200,10 @@
{
return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
}
+ public List<Dt_OutStockLockInfo> GetByMesOrderDetail(string taskNo)
+ {
+ return BaseDal.QueryData(x => x.OrderNo == taskNo);
+ }
public List<Dt_OutStockLockInfo> GetStockOutboundOrder(SaveModel saveModel)
{
--
Gitblit v1.9.3