From 5f53f4af369a1c7a8a09eb1f45c20a8581d107a9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 19 三月 2026 22:20:07 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 45e4270..9284f59 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"
@@ -59,13 +59,16 @@
// 鑾峰彇鎵�鏈夎鍗旾D
var orderIds = pageData.Rows.Select(o => o.Id).ToList();
- // 鎵归噺鏌ヨ鎵�鏈夊叧鑱旂殑鏄庣粏锛岃繃婊ゆ帀鐗╂枡缂栧彿涓虹┖鐨勬暟鎹�
+ // 鎵归噺鏌ヨ鎵�鏈夊叧鑱旂殑鏄庣粏锛屾寜OutSGOrderId鍗囧簭銆両d闄嶅簭鎺掑簭锛屼笌璁㈠崟鏄庣粏椤甸潰淇濇寔涓�鑷�
var allDetails = BaseDal.Db.Queryable<Dt_OutSGOrderDetail>()
- .Where(d => orderIds.Contains(d.OutSGOrderId) && !string.IsNullOrEmpty(d.MaterialNo))
+ .Where(d => orderIds.Contains(d.OutSGOrderId))
+ .OrderBy(d => d.OutSGOrderId)
+ .OrderByDescending(d => d.Id)
.ToList();
- // 鎸夎鍗旾D鍒嗙粍
- var detailsByOrderId = allDetails.GroupBy(d => d.OutSGOrderId).ToDictionary(g => g.Key, g => g.ToList());
+ // 鎸夎鍗旾D鍒嗙粍锛屾瘡缁勬槑缁嗘寜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)
@@ -90,11 +93,29 @@
order.MaterialWides = uniqueWidths.Count == 1
? uniqueWidths[0]
: string.Join("/", uniqueWidths);
+
+ // 璁剧疆妤炲埆锛屽彧鏄剧ず涓�涓紙鍥犱负鎵�鏈夋鍒浉鍚岋級
+ order.BoardFluteNos = details.FirstOrDefault()?.BoardFluteNo ?? "";
+
+ // 璁剧疆鏄惁缂烘枡锛氬鏋滄湁浠讳綍涓�涓槑缁嗘槸缂烘枡鐘舵�侊紝灏辫缃负true
+ // 寮曠敤WIDESEA_Common.OrderEnum鍛藉悕绌洪棿鏉ヤ娇鐢∣utOrderStatusEnum鏋氫妇
+ 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 = "";
}
}
}
--
Gitblit v1.9.3