liulijun
2026-03-10 7583978e1c6046b4cdfe9e1a18efd328a3b73e5d
ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs
@@ -1,4 +1,4 @@
using AutoMapper;
using AutoMapper;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -23,6 +23,8 @@
using System.Text.RegularExpressions;
using Microsoft.AspNetCore.Http;
using HslCommunication;
using SqlSugar;
using WIDESEA_Core.Enums;
namespace WIDESEA_OutboundService
{
@@ -46,6 +48,51 @@
            _unitOfWorkManage = unitOfWorkManage;
        }
        
        public override PageGridData<Dt_OutSGOrder> GetPageData(PageDataOptions options)
        {
            // 1. è°ƒç”¨åŸºç±»æ–¹æ³•获取分页数据
            PageGridData<Dt_OutSGOrder> pageData = base.GetPageData(options);
            // 2. å¦‚果有数据,处理每个订单的物料编号和幅宽
            if (pageData.Rows != null && pageData.Rows.Count > 0)
            {
                // èŽ·å–æ‰€æœ‰è®¢å•ID
                var orderIds = pageData.Rows.Select(o => o.Id).ToList();
                // æ‰¹é‡æŸ¥è¯¢æ‰€æœ‰å…³è”的明细,过滤掉物料编号为空的数据
                var allDetails = BaseDal.Db.Queryable<Dt_OutSGOrderDetail>()
                    .Where(d => orderIds.Contains(d.OutSGOrderId) && !string.IsNullOrEmpty(d.MaterialNo))
                    .ToList();
                // æŒ‰è®¢å•ID分组
                var detailsByOrderId = allDetails.GroupBy(d => d.OutSGOrderId).ToDictionary(g => g.Key, g => g.ToList());
                // å¤„理每个订单
                foreach (var order in pageData.Rows)
                {
                    if (detailsByOrderId.TryGetValue(order.Id, out var details))
                    {
                        // æŒ‰ç‰©æ–™ç¼–号和幅宽的组合分组:若物料代码相同但幅宽不同,会被分成不同的组
                        var materialGroups = details
                            .GroupBy(d => new {
                                MaterialNo = d.MaterialNo,
                                Width = d.Width
                            })
                            .Select(g => $"{g.Key.MaterialNo}({g.Key.Width})").ToList();
                        // å°†åˆ†ç»„结果合并为一个字符串,多个组之间用逗号分隔
                        order.MaterialNoWidth = string.Join(",", materialGroups);
                    }
                    else
                    {
                        order.MaterialNoWidth = "";
                    }
                }
            }
            return pageData;
        }
        public WebResponseContent AddOutSGOrder(List<SGOutOrderDTO> outOrderDTOs)
        {
            WebResponseContent content = new WebResponseContent();