修复货位平面图锁定状态的显示

liulijun

2026-03-20 1c631b345aae30bb6aa7e9dc8d856a0f40d5f1e3

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

@@ -59,13 +59,16 @@
                // èŽ·å–所有订单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))
                    .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)
@@ -91,15 +94,28 @@
                            ? 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 = "";
                    }
                }
            }