From e69f814f50fd59739dbedd88518dc8cb8d2ed3ee Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期二, 08 四月 2025 21:18:47 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ContainerService.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ContainerService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ContainerService.cs"
index 43520f5..3f9c1a7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ContainerService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ContainerService.cs"
@@ -9,9 +9,10 @@
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IBasicInfoRepository;
+using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_Model.Models;
-namespace WIDESEAWCS_IBasicInfoService
+namespace WIDESEAWCS_BasicInfoService
{
public class ContainerService : ServiceBase<Dt_Container, IContainerRepository>, IContainerService
{
@@ -31,7 +32,7 @@
containerInfos = orderContainers;
if (containerInfos.Count == 1)
{
- Dt_Container container = Db.Queryable<Dt_Container>().First(x => x.ContainerStatus == ContainerStatusEnum.Empty.ObjToInt());
+ Dt_Container container = Db.Queryable<Dt_Container>().OrderBy(x => x.ContainerSort).First(x => x.ContainerStatus == ContainerStatusEnum.Empty.ObjToInt());
if (container != null)
{
Dt_OrderContainer containerInfo = _mapper.Map<Dt_OrderContainer>(container);
@@ -41,10 +42,10 @@
}
else
{
- List<Dt_Container> containers = Db.Queryable<Dt_Container>().Where(x => x.ContainerStatus == ContainerStatusEnum.Empty.ObjToInt()).Take(2).ToList();
- if (containers != null && containers.Count > 0)
+ Dt_Container container = Db.Queryable<Dt_Container>().OrderBy(x => x.ContainerSort).First(x => x.ContainerStatus == ContainerStatusEnum.Empty.ObjToInt());
+ if (container != null)
{
- containerInfos = _mapper.Map<List<Dt_OrderContainer>>(containers);
+ containerInfos = _mapper.Map<List<Dt_OrderContainer>>(container);
}
}
--
Gitblit v1.9.3