From 9e579eda4601ed7b492b9d19a24e8146f6ebdf8d Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期六, 19 四月 2025 19:50:43 +0800 Subject: [PATCH] 优化空托出入库逻辑 --- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs | 150 +++++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 74 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs" index f13f851..9bc3cd4 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs" @@ -34,6 +34,44 @@ return stockInfo; } /// <summary> + /// 娣诲姞绌烘墭鐩樼粍鐩樹俊鎭� + /// </summary> + /// <returns></returns> + public WebResponseContent AddStockEmpty(string palletCode) + { + try + { + Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == "Empty000"); + if (materielInfo == null) throw new Exception($"鏈壘鍒扮┖鎵樼洏淇℃伅,鐗╂枡缂栧彿銆怑mpty000銆�"); + Dt_StockInfo stockInfo = new Dt_StockInfo() + { + PalletCode = palletCode, + StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(), + Creater = "System", + Details = new List<Dt_StockInfoDetail>() + }; + Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail() + { + Status = StockStatusEmun.鍏ュ簱纭.ObjToInt(), + OrderNo = DateTime.Now.ToString("yyMMdd"), + StockId = stockInfo.Id != 0 ? stockInfo.Id : 0, + MaterielName = materielInfo.MaterielName, + MaterielCode = materielInfo.MaterielCode, + BatchNo = DateTime.Now.ToString("yyMMdd") + "E", + StockQuantity = 1, + SerialNumber = "", + Creater = "System" + }; + stockInfo.Details.Add(stockInfoDetail); + AddMaterielGroup(stockInfo); + return WebResponseContent.Instance.OK(); + } + catch (Exception ex) + { + return WebResponseContent.Instance.Error(ex.Message); + } + } + /// <summary> /// 娣诲姞缁勭洏/搴撳瓨淇℃伅 /// </summary> /// <returns></returns> @@ -43,21 +81,18 @@ try { var materielCode = productionlineDTO.traytype.ToString(); - if (inboundOrder != null) - { - var inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == productionlineDTO.batchNo); - materielCode = inboundOrderDetail.MaterielCode; - inboundOrderDetail.ReceiptQuantity++; - inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt(); + var inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == productionlineDTO.batchNo); + materielCode = inboundOrderDetail.MaterielCode; + inboundOrderDetail.ReceiptQuantity++; + inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt(); - if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null) - { - inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt(); - } - else if (inboundOrder.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt()) - { - inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt(); - } + if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null) + { + inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt(); + } + else if (inboundOrder.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt()) + { + inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt(); } var materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materielCode); if (materielInfo == null) throw new Exception($"鏈壘鍒扮墿鏂欎俊鎭�,鐗╂枡缂栫爜銆恵materielCode}銆�"); @@ -68,7 +103,7 @@ StockId = stockInfo.Id != 0 ? stockInfo.Id : 0, MaterielName = materielInfo.MaterielName, MaterielCode = materielInfo.MaterielCode, - BatchNo = inboundOrder.Details.FirstOrDefault().BatchNo, + BatchNo = inboundOrderDetail.BatchNo, StockQuantity = 1,// productionlineDTO.QtySum, SerialNumber = "", //SerialNumber = $"{inboundOrder.OrderNo} | {materielInfo.MaterielCode} | {pdaMaterielGroupDTO.BatchNo} | {pdaMaterielGroupDTO.ReceiptQuantity}", @@ -165,67 +200,34 @@ /// <returns></returns> public List<StockSelectViewDTO> GetStockSelectViews(string materielCode) { - List<string> roadways = _basicRepository.RoadwayInfoRepository.CanOutRoadwayNos; - - List<int> warehouseIds = _basicRepository.WarehouseRepository.EnableWarehouseIds; - - List<int> areaIds = _basicRepository.AreaInfoRepository.GetEnableAreaIds(warehouseIds); - - List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(roadways, areaIds); - - #region 鎸夌墿鏂欐暟閲忔煡璇� - //var StockSelectViewDTOs = BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO - //{ - // LocationCode = a.LocationCode, - // MaterielCode = b.MaterielCode, - // MaterielName = b.MaterielName, - // PalletCode = a.PalletCode, - // UseableQuantity = b.StockQuantity - b.OutboundQuantity - //}, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.Status == StockStatusEmun.宸插叆搴�.ObjToInt() && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO - //{ - // LocationCode = x.FirstOrDefault()?.LocationCode ?? "", - // MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "", - // MaterielName = x.FirstOrDefault()?.MaterielName ?? "", - // PalletCode = x.Key, - // UseableQuantity = x.Sum(x => x.UseableQuantity) - //}).ToList(); - #endregion - - #region 鎸夋壒鍙峰拰鎵樼洏鏁伴噺鏌ヨ - //StockSelectViewDTOs = BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO - //{ - // LocationCode = a.LocationCode, - // MaterielCode = b.MaterielCode, - // MaterielName = b.MaterielName, - // PalletCode = a.PalletCode, - // BatchNo = b.BatchNo, - // UseableQuantity = 1 - //}, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.Status == StockStatusEmun.宸插叆搴�.ObjToInt() && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO - //{ - // LocationCode = x.FirstOrDefault()?.LocationCode ?? "", - // MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "", - // MaterielName = x.FirstOrDefault()?.MaterielName ?? "", - // BatchNo = x.FirstOrDefault()?.BatchNo ?? "", - // PalletCode = x.Key, - // UseableQuantity = x.Sum(x => x.UseableQuantity) - //}).ToList(); - #endregion - - #region 鏌ヨ鐗╂枡搴撳瓨鎸夋壒鍙峰垎缁� - var StockSelectViewDTOs = BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO + try { - MaterielCode = b.MaterielCode, - MaterielName = b.MaterielName, - BatchNo = b.BatchNo, - }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.Status == StockStatusEmun.宸插叆搴�.ObjToInt() && b.MaterielCode == materielCode, x => true).GroupBy(x => x.BatchNo).Select(x => new StockSelectViewDTO + //Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materielCode); + //if (materielInfo == null) throw new Exception($"鏈壘鍒扮墿鏂欎俊鎭�"); + return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO + { + LocationCode = a.LocationCode, + MaterielCode = b.MaterielCode, + MaterielName = b.MaterielName, + PalletCode = a.PalletCode, + //UseableQuantity = b.StockQuantity - b.OutboundQuantity + UseableQuantity = b.StockQuantity, + BatchNo = b.BatchNo, + }, a => a.StockStatus == StockStatusEmun.宸插叆搴�.ObjToInt(), b => b.Status == StockStatusEmun.宸插叆搴�.ObjToInt() && b.MaterielCode == materielCode, x => true).GroupBy(x => x.LocationCode).Select(x => new StockSelectViewDTO + { + LocationCode = x.FirstOrDefault()?.LocationCode ?? "", + MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "", + MaterielName = x.FirstOrDefault()?.MaterielName ?? "", + PalletCode = string.Join(",", x.Select(x => x.PalletCode).ToList()), + //UseableQuantity = x.Sum(x => x.UseableQuantity) + UseableQuantity = x.Sum(x => x.UseableQuantity), + BatchNo = x.FirstOrDefault()?.BatchNo ?? "" + }).ToList(); + } + catch (Exception ex) { - MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "", - MaterielName = x.FirstOrDefault()?.MaterielName ?? "", - BatchNo = x.Key, - UseableQuantity = x.Count() - }).ToList(); - #endregion - return StockSelectViewDTOs; + return null; + } } /// <summary> /// 璁$畻搴撳瓨 -- Gitblit v1.9.3