调整了货位详细信息悬浮窗的显示位置

liulijun

2026-03-31 35b1af99c388b5f03b8bf8de53852e5b5e9e60c4

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs

@@ -5,6 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
@@ -80,8 +81,17 @@
                List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseOldCacheStocks(item.MaterialNo, item.Width).Where(x => !palletCodes.Contains(x.PalletCode)).ToList() ?? new List<Dt_StockInfo>();
                //获取立库可用库存
                stockInfos.AddRange(_stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId).Where(x=>!palletCodes.Contains(x.PalletCode)).ToList());
                
                //获取所有该物料单据
                List<Dt_OutSGOrderDetail> details = outboundOrderDetails.Where(x => x.MaterialNo == item.MaterialNo && x.Width == item.Width && x.MachineName == item.MachineName).ToList();

                if (!stockInfos.Any())
                {
                    //没有可用库存，标记为缺料
                    foreach (var detail in details)
                    {
                        detail.OutSGOrderDetailStatus = OutOrderStatusEnum.缺料.ObjToInt();
                    }
                    message += $"物料：{item.MaterialNo},幅宽：{item.Width}无库存；";
                    continue;
                }
@@ -90,8 +100,7 @@
                List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutOldStocks(stockInfos, needQuantity).ToList();
                //添加库存分配
                outStocks.AddRange(autoAssignStocks);
                //获取所有该物料单据
                List<Dt_OutSGOrderDetail> details = outboundOrderDetails.Where(x => x.MaterialNo == item.MaterialNo && x.Width == item.Width && x.MachineName == item.MachineName).ToList();
                
                autoAssignStocks.ForEach(x =>
                {
                    x.StockOutLength = 0;
@@ -144,7 +153,24 @@
                    
                }

                // åˆ†é…å®ŒæˆåŽï¼Œæ£€æŸ¥æ¯ä¸ªè®¢å•æ˜Žç»†çš„分配情况，设置正确的状态
                foreach (var detail in details)
                {
                    decimal assignedQuantity = outStockLockInfos.Where(x => x.OrderDetailId == detail.Id).Sum(x => x.AssignQuantity);
                    if (assignedQuantity > 0)
                    {
                        // å·²ç»åˆ†é…åˆ°åº“存，标记为非缺料状态（未开始）
                        detail.OutSGOrderDetailStatus = OutOrderStatusEnum.未开始.ObjToInt();
                    }
                    else
                    {
                        // æœªåˆ†é…åˆ°åº“存，标记为缺料
                        detail.OutSGOrderDetailStatus = OutOrderStatusEnum.缺料.ObjToInt();
                    }
                }

                locationInfos.AddRange(_basicRepository.LocationInfoRepository.GetLocationInfos(outStocks.Where(x=>!x.LocationCode.IsNullOrEmpty() && !locationInfos.Select(x=>x.LocationCode).Contains(x.LocationCode)).Select(x => x.LocationCode).ToList()));

            }

            return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos, message);