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_Model/Models/Outbound/Dt_OutSGOrder.cs | 34 ++++++++++-------
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs | 30 ++++++++++-----
项目代码/WMS/WMSClient/src/views/outbound/outSGOrder.vue | 19 ++++++---
3 files changed, 53 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
index b8d9f4c..3252127 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
@@ -121,12 +121,19 @@
align: "left",
},
{
- field: "materialNoWidth",
- title: "鐗╂枡缂栧彿锛堝箙瀹斤級",
- type: "string",
- width: 160,
- align: "left",
- },
+ field: "materialNos",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "materialWides",
+ title: "骞呭",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
]);
const detail = ref({
cnName: "鍑哄簱鏄庣粏鍗�",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs"
index 7e0d6be..50b9055 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs"
@@ -67,21 +67,27 @@
public int OutSGOrderStatus { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
- /// <summary>
- /// 鐗╂枡缂栧彿锛堝箙瀹斤級
- /// </summary>
- [SugarColumn(IsIgnore = true, ColumnDescription = "鐗╂枡缂栧彿锛堝箙瀹斤級")]
- public string MaterialNoWidth { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(IsIgnore = true, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterialNos { get; set; }
- /// <summary>
- /// 閲囪喘鍒楄〃
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_OutSGOrderDetail.OutSGOrderId), nameof(Id))]
- public List<Dt_OutSGOrderDetail> Details { get; set; }
+ /// <summary>
+ /// 骞呭
+ /// </summary>
+ [SugarColumn(IsIgnore = true, ColumnDescription = "骞呭")]
+ public string MaterialWides { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍒楄〃
+ /// </summary>
+ [Navigate(NavigateType.OneToMany, nameof(Dt_OutSGOrderDetail.OutSGOrderId), nameof(Id))]
+ public List<Dt_OutSGOrderDetail> Details { get; set; }
}
}
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 4c9f433..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"
@@ -72,20 +72,30 @@
{
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();
+ // 鑾峰彇鎵�鏈夊敮涓�鐨勭墿鏂欑紪鍙�
+ var uniqueMaterialNos = details
+ .Select(d => d.MaterialNo)
+ .Distinct()
+ .ToList();
- // 灏嗗垎缁勭粨鏋滃悎骞朵负涓�涓瓧绗︿覆锛屽涓粍涔嬮棿鐢ㄩ�楀彿鍒嗛殧
- order.MaterialNoWidth = string.Join(",", materialGroups);
+ // 鑾峰彇鎵�鏈夊敮涓�鐨勫箙瀹�
+ 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.MaterialNoWidth = "";
+ order.MaterialNos = "";
+ order.MaterialWides = "";
}
}
}
--
Gitblit v1.9.3