From 89bccb9b8fb1070f7ac5f36510c868fecead9384 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 17 三月 2026 17:00:05 +0800
Subject: [PATCH] 更新
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 fdfdbc8..a6bb559 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"
@@ -61,7 +61,7 @@
// 鎵归噺鏌ヨ鎵�鏈夊叧鑱旂殑鏄庣粏锛岃繃婊ゆ帀鐗╂枡缂栧彿涓虹┖鐨勬暟鎹�
var allDetails = BaseDal.Db.Queryable<Dt_OutSGOrderDetail>()
- .Where(d => orderIds.Contains(d.OutSGOrderId) && !string.IsNullOrEmpty(d.MaterialNo))
+ .Where(d => orderIds.Contains(d.OutSGOrderId))
.ToList();
// 鎸夎鍗旾D鍒嗙粍
@@ -72,10 +72,9 @@
{
if (detailsByOrderId.TryGetValue(order.Id, out var details))
{
- // 鑾峰彇鎵�鏈夊敮涓�鐨勭墿鏂欑紪鍙�
- var uniqueMaterialNos = details
+ // 鑾峰彇鎵�鏈夌墿鏂欑紪鍙凤紝鍖呮嫭閲嶅鐨�
+ var allMaterialNos = details
.Select(d => d.MaterialNo)
- .Distinct()
.ToList();
// 鑾峰彇鎵�鏈夊敮涓�鐨勫箙瀹�
@@ -84,18 +83,33 @@
.Distinct()
.ToList();
- // 璁剧疆鐗╂枡缂栧彿锛屽涓敤鏂滄潬鍒嗛殧
- order.MaterialNos = string.Join("/", uniqueMaterialNos);
+ // 璁剧疆鐗╂枡缂栧彿锛屾墍鏈夌墿鏂欑紪鍙风敤鏂滄潬鍒嗛殧锛屽寘鎷噸澶嶇殑
+ order.MaterialNos = string.Join("/", allMaterialNos);
// 璁剧疆骞呭锛氬鏋滃箙瀹芥湁澶氫釜涓嶄竴鑷寸殑鏁板�煎氨鏄剧ず澶氫釜锛屽鏋滀竴鏍峰氨鏄剧ず涓�涓�
order.MaterialWides = uniqueWidths.Count == 1
? uniqueWidths[0]
: string.Join("/", uniqueWidths);
+
+ // 璁剧疆鏄惁缂烘枡锛氬鏋滄湁浠讳綍涓�涓槑缁嗘槸缂烘枡鐘舵�侊紝灏辫缃负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