From 7583978e1c6046b4cdfe9e1a18efd328a3b73e5d Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期二, 10 三月 2026 17:26:22 +0800
Subject: [PATCH] 优化老厂排程单信息页面（添加物料编号和幅宽的数据显示）
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
index 14554e5..4c9f433 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
@@ -1,4 +1,4 @@
-锘縰sing 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
{
@@ -45,6 +47,51 @@
_mapper = mapper;
_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)
+ {
+ // 鑾峰彇鎵�鏈夎鍗旾D
+ 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();
+
+ // 鎸夎鍗旾D鍒嗙粍
+ 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)
{
--
Gitblit v1.9.3