From 311af0e12107da928e0633f0b3a274e9bccc7e05 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期三, 11 三月 2026 10:31:24 +0800
Subject: [PATCH] 继续优化老厂排程单页面（按照要求单独增加幅宽一列数据）
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 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..fdfdbc8 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,61 @@
_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 uniqueMaterialNos = details
+ .Select(d => d.MaterialNo)
+ .Distinct()
+ .ToList();
+
+ // 鑾峰彇鎵�鏈夊敮涓�鐨勫箙瀹�
+ var uniqueWidths = details
+ .Select(d => d.Width.ToString())
+ .Distinct()
+ .ToList();
+
+ // 璁剧疆鐗╂枡缂栧彿锛屽涓敤鏂滄潬鍒嗛殧
+ order.MaterialNos = string.Join("/", uniqueMaterialNos);
+
+ // 璁剧疆骞呭锛氬鏋滃箙瀹芥湁澶氫釜涓嶄竴鑷寸殑鏁板�煎氨鏄剧ず澶氫釜锛屽鏋滀竴鏍峰氨鏄剧ず涓�涓�
+ order.MaterialWides = uniqueWidths.Count == 1
+ ? uniqueWidths[0]
+ : string.Join("/", uniqueWidths);
+ }
+ else
+ {
+ order.MaterialNos = "";
+ order.MaterialWides = "";
+ }
+ }
+ }
+
+ return pageData;
+ }
public WebResponseContent AddOutSGOrder(List<SGOutOrderDTO> outOrderDTOs)
{
--
Gitblit v1.9.3