From b35e72bcf8011cf6e30182b0800e2f6e1a18e149 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期三, 28 五月 2025 15:40:06 +0800 Subject: [PATCH] 更新代码 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs | 50 +++++++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 21 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 8fb3c42..5da8a45 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" @@ -13,7 +13,6 @@ using WIDESEA_IRecordService; using WIDESEA_IStockService; using WIDESEA_Model.Models; -using WIDESEA_Model.Models.Outbound; namespace WIDESEA_IOutboundService { @@ -125,32 +124,37 @@ /// <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 + }; + 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() @@ -184,6 +188,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