From 0023d3db5bd701864b73e57c0240c219c40c3a4e Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期一, 14 七月 2025 14:12:34 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ErpProScrapSheetDetailService.cs | 108 +++++------------------------------------------------ 1 files changed, 11 insertions(+), 97 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ErpProScrapSheetDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ErpProScrapSheetDetailService.cs" index 7fb5094..c699330 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ErpProScrapSheetDetailService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ErpProScrapSheetDetailService.cs" @@ -38,7 +38,7 @@ public IBasicService _basicService; public IRecordService _recordService; - public ErpProScrapSheetDetailService(IErpProScrapSheetDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IErpProScrapSheetRepository proScrapSheetRepository, IInvokeERPService invokeERPService, IStockRepository stockRepository, IStockService stockService, IOutProStockInfoService outProStockInfoService, IRecordService recordService) : base(BaseDal) + public ErpProScrapSheetDetailService(IErpProScrapSheetDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IErpProScrapSheetRepository proScrapSheetRepository, IInvokeERPService invokeERPService, IStockRepository stockRepository, IStockService stockService, IOutProStockInfoService outProStockInfoService, IRecordService recordService, IBasicService basicService) : base(BaseDal) { _unitOfWorkManage = unitOfWorkManage; _proScrapSheetRepository = proScrapSheetRepository; @@ -47,6 +47,7 @@ _stockService = stockService; _outProStockInfoService = outProStockInfoService; _recordService = recordService; + _basicService = basicService; } //鑾峰彇瀵瑰簲鍗曞彿鐨勬姤搴熸槑缁� public List<Dt_ErpProScrapSheetDetail> GetByDetails(string scrapNo) @@ -98,7 +99,7 @@ { PartNum = item.ScrapProCode, PartRev = item.ScrapProVersion, - Lotno = item.ScrapProVersion, + Lotno = item.ScrapProCode, QtyOfArray = item.ScrapSETQty, QtyOfUnit = item.ScrapPcsQty, QtyOfArray_Alloc = 0, @@ -130,7 +131,7 @@ { PartNum = item.ScrapProCode, PartRev = item.ScrapProVersion, - Lotno = item.ScrapProVersion, + Lotno = item.ScrapProCode, QtyOfArray = item.ScrapSETQty, QtyOfUnit = item.ScrapPcsQty, QtyOfArray_Alloc = 0, @@ -211,87 +212,6 @@ List<Dt_ProStockInfo> outStocks = new List<Dt_ProStockInfo>(); List<Dt_OutProStockInfo> outProStockInfos = new List<Dt_OutProStockInfo>(); List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>(); - //List<Dt_ProOutOrderDetail> groupDetails = proOutOrderDetails.GroupBy(x => new { x.SaleOrder, x.PCode, x.PVer, x.PLot, x.DateCode }).Select(x => new Dt_ProOutOrderDetail() - //{ - // QtyPcs = x.Sum(x => x.QtyPcs) - x.Sum(x => x.OverQtyPcs), - // SaleOrder = x.Key.SaleOrder, - // PCode = x.Key.PCode, - // PVer = x.Key.PVer, - // PLot = x.Key.PLot, - // DateCode = x.Key.DateCode, - //}).ToList(); - //foreach (var item in groupDetails) - //{ - // float needQty = item.QtyPcs; - // //鏌ユ壘鍙敤搴撳瓨 - // List<Dt_ProStockInfo> stockInfoss = _stockInfoService.ProStockInfoService.GetUseableStocks(proOutOrder.WarehouseId, item); - // if (!stockInfoss.Any()) - // { - // throw new Exception("鏈壘鍒板彲鍒嗛厤搴撳瓨"); - // } - // //鑾峰彇鍑哄簱搴撳瓨 - // List<Dt_ProStockInfo> assignOutStocks = _stockInfoService.ProStockInfoService.GetOutboundStocks(stockInfoss, item, needQty, out float residueQuantity); - // item.LockQtyPcs += needQty - residueQuantity; - // if (item.QtyPcs> item.LockQtyPcs) - // { - // throw new Exception($"浜у搧缂栫爜{item.PCode}鍙垎閰嶆暟閲忎笉瓒�,鍙敤鏁伴噺{item.LockQtyPcs}"); - // } - // outStocks.AddRange(assignOutStocks); - // float assignQuantity = needQty - residueQuantity; - // bool isCanLot = string.IsNullOrEmpty(item.PLot); - // bool isCanDate = string.IsNullOrEmpty(item.DateCode); - // List<Dt_ProOutOrderDetail> details = proOutOrderDetails - // .Where(x =>x.PCode == item.PCode && x.PVer == item.PVer - // && (isCanLot ? isCanLot : x.PLot == item.PLot) - // && (isCanDate ? isCanDate : x.DateCode == item.DateCode)) - // .ToList(); - - // for (int i = 0; i < details.Count; i++) - // { - // float orderQuantity = details[i].QtyPcs; - // for (int j = 0; j < assignOutStocks.Count; j++) - // { - // //鍑哄簱璁㈠崟鏄庣粏宸插垎閰嶆暟閲� - // float detailAssignQuantity = outProStockInfos.Where(x => x.PCode == item.PCode && x.PVer == item.PVer - // && (isCanLot ? isCanLot : x.PLot == item.PLot) - // && (isCanDate ? isCanDate : x.DateCode == item.DateCode) - // && x.OrderDetailId == details[i].Id).Sum(x => x.AssignQuantity); - - // float palletAssignQuantity = outProStockInfos.Where(x => x.PCode == item.PCode && x.PVer == item.PVer - // && (isCanLot ? isCanLot : x.PLot == item.PLot) - // && (isCanDate ? isCanDate : x.DateCode == item.DateCode) - // && x.PalletCode == assignOutStocks[j].PalletCode).Sum(x => x.AssignQuantity); - // //鍑哄簱璇︽儏宸插垎閰嶆暟閲� - // palletAssignQuantity = outProStockInfos.Where(x => x.PCode == item.PCode && x.PVer == item.PVer - // && (isCanLot ? isCanLot : x.PLot == item.PLot) - // && (isCanDate ? isCanDate : x.DateCode == item.DateCode) - // && x.PalletCode == assignOutStocks[j].PalletCode).Sum(x => x.AssignQuantity);//鍑哄簱璇︽儏宸插垎閰嶆暟閲� - // float palletOutboundQuantity = assignOutStocks[j].proStockInfoDetails.Sum(x => x.OutboundQuantity); - // if (palletAssignQuantity < palletOutboundQuantity)//濡傛灉鍑哄簱璇︽儏宸插垎閰嶆暟閲忓皬浜庢墭鐩樺凡鍒嗛厤鏁伴噺锛屽垯鍙互缁х画娣诲姞璇ユ墭鐩樺嚭搴撲俊鎭� - // { - // float orderDetailNeedQuantity = details[i].QtyPcs - detailAssignQuantity; - // if (orderDetailNeedQuantity > assignOutStocks[j].proStockInfoDetails.Sum(x => x.OutboundQuantity) - palletAssignQuantity) - // { - // details[i].LockQtyPcs += assignOutStocks[j].proStockInfoDetails.Sum(x => x.OutboundQuantity) - palletAssignQuantity; - // Dt_OutProStockInfo outStockLockInfo = _outProStockInfoService.GetOutStockLockInfo(proOutOrder, details[i], assignOutStocks[j], assignOutStocks[j].proStockInfoDetails.Sum(x => x.OutboundQuantity) - palletAssignQuantity); - // outProStockInfos.Add(outStockLockInfo); - // } - // else - // { - // Dt_OutProStockInfo outStockLockInfo = _outProStockInfoService.GetOutStockLockInfo(proOutOrder, details[i], assignOutStocks[j], details[i].QtyPcs - details[i].LockQtyPcs); - // outProStockInfos.Add(outStockLockInfo); - // details[i].LockQtyPcs = details[i].QtyPcs; - // break; - // } - - // } - // } - // } - // List<string> locationArr = outStocks.Select(x => x.LocationCode).ToList(); - - // locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(locationArr)); - - //} foreach (var item in proOutOrderDetails) { float needQty = item.ScrapPcsQty; @@ -314,15 +234,6 @@ { //鍑哄簱璁㈠崟鏄庣粏宸插垎閰嶆暟閲� float detailAssignQuantity = outProStockInfos.Where(x => x.OrderDetailId == item.Id).Sum(x => x.AssignQuantity); - ////鍑哄簱璇︽儏宸插垎閰嶆暟閲� - //float palletAssignQuantity = outProStockInfos.Where(x => x.PCode == item.PCode && x.PVer == item.PVer - // && (isCanLot ? isCanLot : x.PLot == item.PLot) - // && (isCanDate ? isCanDate : x.DateCode == item.DateCode) - // && x.PalletCode == assignOutStocks[j].PalletCode).Sum(x => x.AssignQuantity); - ////鍑哄簱璇︽儏宸插垎閰嶆暟閲� - //float palletOutboundQuantity = assignOutStocks[j].proStockInfoDetails.Sum(x => x.OutboundQuantity); - //if (palletAssignQuantity < palletOutboundQuantity)//濡傛灉鍑哄簱璇︽儏宸插垎閰嶆暟閲忓皬浜庢墭鐩樺凡鍒嗛厤鏁伴噺锛屽垯鍙互缁х画娣诲姞璇ユ墭鐩樺嚭搴撲俊鎭� - //{ float orderDetailNeedQuantity = item.ScrapPcsQty - detailAssignQuantity; if (orderDetailNeedQuantity > assignOutStocks[j].proStockInfoDetails.Sum(x => x.OutboundQuantity)) { @@ -339,10 +250,13 @@ } //} } - List<string> locationArr = outStocks.Select(x => x.LocationCode).ToList(); - - locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(locationArr)); - + List<string> locationCodes = outStocks.Select(x => x.LocationCode).ToList(); + List<Dt_LocationInfo> locationInfos1 = _basicService.LocationInfoService.Repository.GetLocationInfos(locationCodes); + if (locationInfos1 == null) + { + throw new Exception($"{locationCodes}璐т綅鏌ヨ涓虹┖锛岃妫�鏌�"); + } + locationInfos.AddRange(locationInfos1); } return (outStocks, proOutOrderDetails, outProStockInfos, locationInfos); } -- Gitblit v1.9.3