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 | 17 ++++++++++++++++-
1 files changed, 16 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 45e4270..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鍒嗙粍
@@ -90,11 +90,26 @@
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