From 41a5531dc31a642623f0a7a766fbe9c256ba9247 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 11 二月 2025 13:53:29 +0800
Subject: [PATCH] 优化WMS前端
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
index 2f1c49b..5541d80 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
@@ -40,12 +40,36 @@
}
public WebResponseContent UpdateStatus(List<string> locationCodes, int Statu)
{
- List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => locationCodes.Contains(x.LocationCode));
- locationInfos.ForEach(x =>
+ WebResponseContent content = new WebResponseContent().OK();
+ try
{
- x.LocationStatus = Statu;
- });
- return UpdateData(locationInfos);
+ List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => locationCodes.Contains(x.LocationCode));
+ foreach (var locationCode in locationCodes.GroupBy(x => x))
+ {
+ if (locationCode.Count() > 2) throw new Exception("璐т綅缁戝畾鏌滃彿杩囧");
+ if (locationCode.Count() > 1)
+ {
+ var location = locationInfos.Where(x => x.LocationCode == locationCode.Key).FirstOrDefault();
+ if (location != null && location.LocationStatus == Statu) throw new Exception("璐т綅缁戝畾鏌滃彿杩囧");
+ if (locationCode.Count() == 2) location.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
+ }
+ //else
+ //{
+ // throw new Exception("璐т綅缁戝畾鏌滃彿杩囧");
+ //}
+ }
+ locationInfos.ForEach(x =>
+ {
+ if (x.MaxQty == 12 || x.LocationStatus == Statu) x.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
+ x.LocationStatus = Statu;//LocationStatusEnum.PalletLock.ObjToInt()
+ });
+ content = UpdateData(locationInfos);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
}
/// <summary>
/// 鍒嗛厤璐т綅
@@ -56,9 +80,9 @@
/// <exception cref="Exception"></exception>
public Dt_LocationInfo AssignLocation(int inboundOrderCount)
{
- Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.MaxQty == (inboundOrderCount > 1 ? 24 : 12), _emptyAssignOrderBy);
+ Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.Row == (inboundOrderCount > 1 ? 1 : 3), _emptyAssignOrderBy);
- if (locationInfo == null) locationInfo = BaseDal.QueryFirst(x => (x.LocationStatus == LocationStatusEnum.Free.ObjToInt() || x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() || x.LocationStatus == LocationStatusEnum.Inbounding.ObjToInt()) && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()), _emptyAssignOrderBy);
+ if (locationInfo == null) locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()), _emptyAssignOrderBy);
return locationInfo;
}
--
Gitblit v1.9.3