From 733e63cb362f17aea4a1020654fa348a0d0c1f06 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 24 二月 2025 00:08:59 +0800
Subject: [PATCH] 优化入库逻辑，优化直接出库逻辑，优化移库任务逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 97 insertions(+), 2 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 cf58bf1..776de38 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"
@@ -1,4 +1,6 @@
-锘縰sing SqlSugar;
+锘縰sing Microsoft.AspNetCore.Mvc.RazorPages;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -19,6 +21,7 @@
public partial class LocationInfoService : ServiceBase<Dt_LocationInfo, ILocationInfoRepository>, ILocationInfoService
{
+
private Dictionary<string, OrderByType> _emptyAssignOrderBy = new Dictionary<string, OrderByType>()
{
{ nameof(Dt_LocationInfo.Depth), OrderByType.Desc },
@@ -26,6 +29,83 @@
{ nameof(Dt_LocationInfo.Column), OrderByType.Asc },
{ nameof(Dt_LocationInfo.Row), OrderByType.Asc },
};
+ /// <summary>
+ /// 鏍规嵁璐т綅缂栧彿鑾峰彇璐т綅淇℃伅
+ /// </summary>
+ /// <param name="LocationCode"></param>
+ /// <returns></returns>
+ public Dt_LocationInfo GetLocation(string LocationCode)
+ {
+ return BaseDal.QueryData(x => x.LocationCode == LocationCode).FirstOrDefault();
+ }
+ public WebResponseContent UpdateStatus(List<string> locationCodes, int Statu)
+ {
+ WebResponseContent content = new WebResponseContent().OK();
+ try
+ {
+ 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>
+ /// 鑾峰彇鍙Щ搴撹揣浣�
+ /// </summary>
+ /// <returns></returns>
+ public Dt_LocationInfo AssignLocation()
+ {
+ Dt_LocationInfo locationInfo = null;
+ locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.Row == 3, _emptyAssignOrderBy);
+
+ if (locationInfo == null)
+ locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 1), _emptyAssignOrderBy);
+ if (locationInfo == null)
+ locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 2), _emptyAssignOrderBy);
+ return locationInfo;
+ }
+ /// <summary>
+ /// 鍒嗛厤璐т綅
+ /// </summary>
+ /// <param name="stockInfo">缁勭洏淇℃伅</param>
+ /// <param name="inboundOrder">鍏ュ簱鍗�</param>
+ /// <returns></returns>
+ /// <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.Row == (inboundOrderCount > 1 ? 1 : 3), _emptyAssignOrderBy);
+
+ if (locationInfo == null)
+ {
+ var locationInfos = BaseDal.QueryData(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()), _emptyAssignOrderBy);
+ if (locationInfos.Count > 1) locationInfo = locationInfos[0];//闇�棰勭暀涓�涓揣浣嶇Щ搴�
+ }
+
+ return locationInfo;
+ }
+
public virtual Dt_LocationInfo? AssignLocation(string stationCode, int inboundType)
{
@@ -98,7 +178,7 @@
return BaseDal.QueryFirst(x => x.Id == id);
}
- return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo == roadway), _emptyAssignOrderBy);
+ return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() || x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo == roadway), _emptyAssignOrderBy);
}
public Dt_LocationInfo AdjacentDepthLocation(string locationCode)
@@ -111,5 +191,20 @@
{
return BaseDal.QueryFirst(x => x.RoadwayNo == locationInfo.RoadwayNo && x.Column == locationInfo.Column && x.Layer == locationInfo.Layer && x.Depth != locationInfo.Depth && x.Row != locationInfo.Row && (SqlFunc.Abs(x.Row - locationInfo.Row) == 1));
}
+
+ public WebResponseContent GetPosition(string position)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && (x.Row == 1 || x.Row == 3), _emptyAssignOrderBy);
+ if (locationInfo != null) content.OK(locationInfo.LocationCode);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3