From 4da42c12efde190b208f18b7dd51d3e89986837d Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期一, 07 四月 2025 11:19:16 +0800
Subject: [PATCH] 代码逻辑优化
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/CachePointService.cs | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/CachePointService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/CachePointService.cs"
index f8f4e41..d160508 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/CachePointService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/CachePointService.cs"
@@ -21,29 +21,26 @@
private readonly Dictionary<string, OrderByType> _emptyAssignOrderBy = new()
{
- { nameof(Dt_CachePoint.Depth), OrderByType.Desc },
- { nameof(Dt_CachePoint.Column), OrderByType.Asc },
- { nameof(Dt_CachePoint.Row), OrderByType.Asc },
};
public Dt_CachePoint? AssignCachePoint(int areaId)
{
- List<CachePointGroupDTO> cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.Free);
- if (cachePointGroups != null && cachePointGroups.Count > 0)
- {
- CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusB == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
- int id = pointGroupDTO?.IdB ?? 0;
- return BaseDal.QueryFirst(x => x.Id == id);
- }
- cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.Free, LocationStatusEnum.Free);
- if (cachePointGroups != null && cachePointGroups.Count > 0)
- {
- CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusA == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
- int id = pointGroupDTO?.IdA ?? 0;
- return BaseDal.QueryFirst(x => x.Id == id);
- }
+ //List<CachePointGroupDTO> cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.Free);
+ //if (cachePointGroups != null && cachePointGroups.Count > 0)
+ //{
+ // CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusB == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
+ // int id = pointGroupDTO?.IdB ?? 0;
+ // return BaseDal.QueryFirst(x => x.Id == id);
+ //}
+ //cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.Free, LocationStatusEnum.Free);
+ //if (cachePointGroups != null && cachePointGroups.Count > 0)
+ //{
+ // CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusA == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
+ // int id = pointGroupDTO?.IdA ?? 0;
+ // return BaseDal.QueryFirst(x => x.Id == id);
+ //}
- return BaseDal.QueryFirst(x => x.PointStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.AreaId == areaId), _emptyAssignOrderBy);
+ return BaseDal.QueryFirst(x => x.PointStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()), _emptyAssignOrderBy);
}
public Dt_CachePoint? EmptyCachePoint(string toaddress)
@@ -55,22 +52,22 @@
public Dt_CachePoint? GetIbStockCachePoint(int areaId)
{
- List<CachePointGroupDTO> cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.Free);
- if (cachePointGroups != null && cachePointGroups.Count > 0)
- {
- CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusA == StatusEnum.OnlyOut.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
- int id = pointGroupDTO?.IdA ?? 0;
- return BaseDal.QueryFirst(x => x.Id == id);
- }
- cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.InStock);
- if (cachePointGroups != null && cachePointGroups.Count > 0)
- {
- CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusB == StatusEnum.OnlyOut.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
- int id = pointGroupDTO?.IdB ?? 0;
- return BaseDal.QueryFirst(x => x.Id == id);
- }
+ //List<CachePointGroupDTO> cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.Free);
+ //if (cachePointGroups != null && cachePointGroups.Count > 0)
+ //{
+ // CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusA == StatusEnum.OnlyOut.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
+ // int id = pointGroupDTO?.IdA ?? 0;
+ // return BaseDal.QueryFirst(x => x.Id == id);
+ //}
+ //cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.InStock);
+ //if (cachePointGroups != null && cachePointGroups.Count > 0)
+ //{
+ // CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusB == StatusEnum.OnlyOut.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
+ // int id = pointGroupDTO?.IdB ?? 0;
+ // return BaseDal.QueryFirst(x => x.Id == id);
+ //}
- return BaseDal.QueryFirst(x => x.PointStatus == LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatus == StatusEnum.OnlyOut.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.AreaId == areaId), _emptyAssignOrderBy);
+ return BaseDal.QueryFirst(x => x.PointStatus == LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatus == StatusEnum.OnlyOut.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()), _emptyAssignOrderBy);
}
public WebResponseContent GetEndPoints()
@@ -103,13 +100,13 @@
Dt_CachePoint cachePoints = BaseDal.QueryFirst(x => x.PointCode == stationcode);
if (cachePoints == null)
{
- content = WebResponseContent.Instance.Error("涓烘壘鍒版缂撳瓨鏋�");
+ content = WebResponseContent.Instance.Error("鏈壘鍒版缂撳瓨鏋�");
}
content = WebResponseContent.Instance.OK(data: cachePoints);
}
catch (Exception ex)
{
- content = WebResponseContent.Instance.Error(ex.Message);
+ content = WebResponseContent.Instance.Error(ex.Message + "鏈壘鍒版缂撳瓨鏋�");
}
return content;
}
--
Gitblit v1.9.3