From 871a7e1ce9a1b1925e228864baf42cafd41371f2 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 03 十二月 2025 10:04:29 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
index 353663f..d222228 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
@@ -140,7 +140,7 @@
private bool CanReassignOrder(Dt_OutboundOrder outboundOrder)
{
// 鍏佽閲嶆柊鍒嗛厤鐨勭姸鎬�
- var allowedStatus = new[] {OutOrderStatusEnum.鏈紑濮�, OutOrderStatusEnum.鍑哄簱涓�,OutOrderStatusEnum.閮ㄥ垎瀹屾垚};
+ var allowedStatus = new[] { OutOrderStatusEnum.鏈紑濮�, OutOrderStatusEnum.鍑哄簱涓�, OutOrderStatusEnum.閮ㄥ垎瀹屾垚 };
return allowedStatus.Contains((OutOrderStatusEnum)outboundOrder.OrderStatus);
}
@@ -682,12 +682,18 @@
decimal remainingAssign = assignQuantity;
// 鎸夊厛杩涘厛鍑哄垎閰嶅簱瀛樻槑缁�
- var sortedDetails = stock.Details
+ var sorteds = stock.Details
.Where(d => d.MaterielCode == detail.MaterielCode &&
- d.BatchNo == detail.BatchNo &&
- (d.StockQuantity - d.OutboundQuantity) > 0)
- .OrderBy(d => d.CreateDate)
- .ToList();
+ (d.StockQuantity - d.OutboundQuantity) > 0);
+ // .OrderBy(d => d.CreateDate);
+
+ if (!string.IsNullOrEmpty(detail.BatchNo))
+ {
+ sorteds= stock.Details.Where(x => x.BatchNo == detail.BatchNo);
+ }
+
+ var sortedDetails= sorteds.ToList().OrderBy(d => d.CreateDate);
+
foreach (var stockDetail in sortedDetails)
{
--
Gitblit v1.9.3