From 4ba2eba294e2e32d4e09cd29f4162e72eae4ef9e Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期二, 10 六月 2025 23:29:56 +0800 Subject: [PATCH] 2 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" index cd80741..1574e33 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" @@ -124,7 +124,7 @@ } if (result.Item1 != null && result.Item1.Count > 0) { - Dt_Task? task = BaseDal.QueryData(x=>x.TaskType==TaskTypeEnum.OutProduct.ObjToInt()).OrderByDescending(x=>x.Grade).FirstOrDefault(); + Dt_Task? task = BaseDal.QueryData(x=>x.TaskType==TaskTypeEnum.OutProduct.ObjToInt()).OrderBy(x=>x.Grade).FirstOrDefault(); //鏇存柊鍑哄簱鐩殑浣嶇疆 result.Item1.ForEach(x => { @@ -486,7 +486,9 @@ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)), PalletType = stockInfo.PalletType, WarehouseId = stockInfo.WarehouseId, - GroupId= groupId + GroupId= groupId, + MaterielCode = stockInfo.proStockInfoDetails.Where(x => x.ProStockId == stockInfo.Id).FirstOrDefault()?.ProductCode, + Quantity = (float)stockInfo.proStockInfoDetails.Where(x => x.ProStockId == stockInfo.Id).Sum(x=> x.StockPcsQty) }; tasks.Add(task); } @@ -525,7 +527,13 @@ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)), PalletType = stockInfo.PalletType, WarehouseId = stockInfo.WarehouseId, + }; + if (taskType != TaskTypeEnum.OutEmpty) + { + task.MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode; + task.Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.StockQuantity; + } if (stockInfo.StockLength>0) { task.TaskLength = stockInfo.StockLength; @@ -774,7 +782,9 @@ StockId = x.Id, TaskNum = 0, OrderQuantity = OrderDetail.OrderQuantity, - Unit = OrderDetail.Unit + Unit = OrderDetail.Unit, + ProductionDate = v.ProductionDate, + EffectiveDate = v.EffectiveDate }; outStockLockInfos.Add(outStockLockInfo); } -- Gitblit v1.9.3