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

liulijun

2026-03-31 35b1af99c388b5f03b8bf8de53852e5b5e9e60c4

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

@@ -59,23 +59,25 @@
                // èŽ·å–所有订单ID
                var orderIds = pageData.Rows.Select(o => o.Id).ToList();
                
                // æ‰¹é‡æŸ¥è¯¢æ‰€æœ‰å…³è”的明细，过滤掉物料编号为空的数据
                // æ‰¹é‡æŸ¥è¯¢æ‰€æœ‰å…³è”的明细，按OutSGOrderId升序、Id降序排序，与订单明细页面保持一致
                var allDetails = BaseDal.Db.Queryable<Dt_OutSGOrderDetail>()
                    .Where(d => orderIds.Contains(d.OutSGOrderId) && !string.IsNullOrEmpty(d.MaterialNo))
                    .Where(d => orderIds.Contains(d.OutSGOrderId))
                    .OrderBy(d => d.OutSGOrderId)
                    .OrderByDescending(d => d.Id)
                    .ToList();
                
                // æŒ‰è®¢å•ID分组
                var detailsByOrderId = allDetails.GroupBy(d => d.OutSGOrderId).ToDictionary(g => g.Key, g => g.ToList());
                // æŒ‰è®¢å•ID分组，每组明细按Id降序排序，与订单明细页面保持一致
                var detailsByOrderId = allDetails.GroupBy(d => d.OutSGOrderId)
                    .ToDictionary(g => g.Key, g => g.OrderByDescending(d => d.Id).ToList());
                
                // å¤„理每个订单
                foreach (var order in pageData.Rows)
                {
                    if (detailsByOrderId.TryGetValue(order.Id, out var details))
                    {
                        // èŽ·å–所有唯一的物料编号
                        var uniqueMaterialNos = details
                        // èŽ·å–所有物料编号，包括重复的
                        var allMaterialNos = details
                            .Select(d => d.MaterialNo)
                            .Distinct()
                            .ToList();
                        
                        // èŽ·å–所有唯一的幅宽
@@ -84,18 +86,36 @@
                            .Distinct()
                            .ToList();
                        
                        // è®¾ç½®ç‰©æ–™ç¼–号，多个用斜杠分隔
                        order.MaterialNos = string.Join("/", uniqueMaterialNos);
                        // è®¾ç½®ç‰©æ–™ç¼–号，所有物料编号用斜杠分隔，包括重复的
                        order.MaterialNos = string.Join("/", allMaterialNos);
                        
                        // è®¾ç½®å¹…宽：如果幅宽有多个不一致的数值就显示多个，如果一样就显示一个
                        order.MaterialWides = uniqueWidths.Count == 1 
                            ? uniqueWidths[0] 
                            : string.Join("/", uniqueWidths);
                        
                        // è®¾ç½®æ¥žåˆ«ï¼Œåªæ˜¾ç¤ºä¸€ä¸ªï¼ˆå› ä¸ºæ‰€æœ‰æ¥žåˆ«ç›¸åŒï¼‰
                        order.BoardFluteNos = details.FirstOrDefault()?.BoardFluteNo ?? "";
                        
                        // è®¾ç½®æ˜¯å¦ç¼ºæ–™ï¼šå¦‚果有任何一个明细是缺料状态，就设置为true
                        // å¼•ç”¨WIDESEA_Common.OrderEnum命名空间来使用OutOrderStatusEnum枚举
                        order.IsLackMaterial = details.Any(d => d.OutSGOrderDetailStatus == 3); // 3是缺料状态的枚举值
                        
                        // ç”Ÿæˆç‰©æ–™ç¼ºæ–™çŠ¶æ€å­—符串：物料编号:状态,物料编号:状态
                        var materialLackStatus = new List<string>();
                        foreach (var detail in details)
                        {
                            var isLack = detail.OutSGOrderDetailStatus == 3;
                            materialLackStatus.Add($"{detail.MaterialNo}:{isLack.ToString().ToLower()}");
                        }
                        order.MaterialLackStatus = string.Join(",", materialLackStatus);
                    }
                    else
                    {
                        order.MaterialNos = "";
                        order.MaterialWides = "";
                        order.IsLackMaterial = false;
                        order.MaterialLackStatus = "";
                    }
                }
            }
@@ -109,8 +129,8 @@
            try
            {
                //获取所有排程单
                List<Dt_OutSGOrder> outSGOrders = BaseDal.Db.Queryable<Dt_OutSGOrder>().Includes(x => x.Details).ToList();
                List<Dt_OutSGOrderDetail> outSGOrderDetails= outSGOrders.SelectMany(x=>x.Details).ToList();
                //List<Dt_OutSGOrder> outSGOrders = BaseDal.Db.Queryable<Dt_OutSGOrder>().Includes(x => x.Details).ToList();
                //List<Dt_OutSGOrderDetail> outSGOrderDetails= outSGOrders.SelectMany(x=>x.Details).ToList();
                ////判断单据
                //Dt_OutSGOrderDetail? ExistAddOutOrderDetail = outSGOrderDetails.FirstOrDefault(x => outOrderDTOs.Select(t => t.BoardMpsDetailId).Distinct().Contains(x.BoardMpsDetailId));
                //if (ExistAddOutOrderDetail != null)
@@ -151,11 +171,13 @@
                    //判断工单是否已经存在
                    if (ExistOutSGOrder != null)
                    {
                        outSGOrderDetail.Number = ExistOutSGOrder.Number;
                        ExistOutSGOrder.Details.Add(outSGOrderDetail);
                    }
                    else
                    {
                        Dt_OutSGOrder outSGOrder = _mapper.Map<Dt_OutSGOrder>(item);
                        outSGOrderDetail.Number = outSGOrder.Number;
                        outSGOrder.Details = new List<Dt_OutSGOrderDetail>() { outSGOrderDetail };
                        AddOutSGOrders.Add(outSGOrder);
                    }