From a34059e688e947a2ea079a0646872f1a21089940 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 22 九月 2025 14:47:00 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
index 6a3ac42..b8978e9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
@@ -69,12 +69,13 @@
}
}
- public Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> WheelsList, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld)
+ public Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> WheelsList, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld,int xuanpeicount)
{
//杩囩泩閲忎笂闄�
decimal selectionUpperValue = selectionStandards.upperValue;
//杩囩泩閲忎笅闄�
decimal selectionLowerValue = selectionStandards.lowerValue;
+
string level = string.Empty;
if ("left".Equals(wheelsPosition)) //鍖归厤宸﹁疆搴ц疆瀛�
@@ -130,7 +131,16 @@
).ToList();
}
}
- return WheelsList.OrderBy(x => x.CreateDate).FirstOrDefault();
+
+ if (newOrOld == "1" && xuanpeicount==2)
+ {
+ return WheelsList.OrderBy(x => decimal.Parse(x.Wheels_ygljz)).FirstOrDefault();
+ }
+ else
+ {
+ return WheelsList.OrderBy(x => x.CreateDate).FirstOrDefault();
+
+ }
}
--
Gitblit v1.9.3