优先级修改

qinchulong

2025-03-08 73e0e7c3886bc88e7ed37db24d28d8f6d159f1c0

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs

@@ -1,7 +1,6 @@


using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using AutoMapper;
using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
@@ -16,19 +15,34 @@
    /// <summary>
    /// è´§ä½ä¿¡æ¯ä¸šåŠ¡æŽ¥å£å®žçŽ°å±‚
    /// </summary>
    public partial class LocationInfoService : ServiceBase<Dt_LocationInfo, IRepository<Dt_LocationInfo>>, ILocationInfoService
    public class LocationInfoService : ServiceBase<Dt_LocationInfo, IRepository<Dt_LocationInfo>>, ILocationInfoService
    {
        public IRepository<Dt_LocationInfo> Repository => BaseDal;
        private readonly IRepository<dt_storagemode> _dt_storagemode;
        private readonly IMapper _mapper;
        //private readonly Idt_ErrormsginfoService _ErrormsginfoService;

        public LocationInfoService(IRepository<Dt_LocationInfo> BaseDal) : base(BaseDal)
        public LocationInfoService(IRepository<Dt_LocationInfo> BaseDal, IRepository<dt_storagemode> storagemode, IMapper mapper) : base(BaseDal)
        {
            _dt_storagemode = storagemode;
            _mapper = mapper;
        }

        public override PageGridData<Dt_LocationInfo> GetPageData(PageDataOptions options)
        {
            return base.GetPageData(options);
        }

        public override WebResponseContent UpdateData(SaveModel saveModel)
        {
            int id = saveModel.MainData["id"].ObjToInt();
            int locationStatus = saveModel.MainData["locationStatus"].ObjToInt();
            int enableStatus = saveModel.MainData["enableStatus"].ObjToInt();
            Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.Id == id);
            locationInfo.LocationStatus = locationStatus;
            locationInfo.EnableStatus = enableStatus;
            return UpdateData(locationInfo);
            //return base.UpdateData(saveModel);
        }
        public WebResponseContent GetLocationLayer()
        {
            WebResponseContent content = new WebResponseContent();
@@ -52,7 +66,7 @@
                return content = WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public WebResponseContent getlocation() 
        public WebResponseContent getlocation()
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -60,13 +74,13 @@
                List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
                for (int i = 1; i < 38; i++)
                {
                    for (int a = 1; a < 7; a++)
                    for (int a = 1; a < 12; a++)
                    {
                        for (int g = 1; g < 3; g++)
                        {
                            Dt_LocationInfo location = new Dt_LocationInfo();
                            location.LocationCode = i+"-"+a+"-"+g;
                            location.LocationName = i+ "行" + a + "列" + "工位" + g;
                            location.LocationCode = i + "-" + a + "-" + g;
                            location.LocationName = i + "行" + a + "列" + "工位" + g;
                            location.RoadwayNo = "TC1";
                            location.Row = i;
                            location.Column = a;
@@ -74,7 +88,7 @@
                            location.Depth = g;
                            location.LocationType = (int)LocationTypeEnum.Flat;
                            location.LocationStatus = (int)LocationStatusEnum.Free;
                            location.EnableStatus=(int)EnableStatusEnum.Normal;
                            location.EnableStatus = (int)EnableStatusEnum.Normal;
                            location.CreateDate = DateTime.Now;
                            location.ModifyDate = DateTime.Now;
                            location.Creater = "WCS";
@@ -89,6 +103,63 @@
            {
                return content = WebResponseContent.Instance.Error(ex.Message);
            }
        }

        /// <summary>
        /// æ ¹æ®é€‰æ‹©çš„入库规则分配货位
        /// </summary>
        /// <param name="InMode"></param>
        /// <returns></returns>
        public Dt_LocationInfo GetInLocation(int InMode) 
        {
            Dt_LocationInfo location = new Dt_LocationInfo();
            try
            {
                var mode = _dt_storagemode.QueryFirst(v=>v.Id==1);
                if (mode.storagemode==(int)StorageModeEnum.Out)
                {
                    var locations = BaseDal.QueryData(v=>v.EnableStatus== (int)EnableStatusEnum.Normal && v.LocationStatus==(int)LocationStatusEnum.Free).OrderBy(v=>v.Row).ToList();
                    if (locations.Count<=0) 
                    {
                        throw new Exception($"出库优先货位分配失败，当前无空闲货位");
                    }
                    location = locations[0];
                }
                else if(mode.storagemode == (int)StorageModeEnum.In)
                {
                    var locations = BaseDal.QueryData(v => v.EnableStatus == (int)EnableStatusEnum.Normal && v.LocationStatus == (int)LocationStatusEnum.Free).OrderByDescending(v => v.Row).ToList();
                    if (locations.Count <= 0)
                    {
                        throw new Exception($"入库优先货位分配失败，当前无空闲货位");
                    }
                    location = locations[0];
                }
                if (location!=null)
                {
                    //查找相邻的库位
                    Dt_LocationInfo Towlocation = new Dt_LocationInfo();

                    var Onelocation = BaseDal.QueryFirst(v => v.LocationCode == location.LocationCode);

                    if (Onelocation.Depth == 1)
                    {
                        Towlocation = BaseDal.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
                    }
                    else
                    {
                        Towlocation = BaseDal.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
                    }
                    location.LocationStatus = (int)LocationStatusEnum.Lock;
                    Towlocation.LocationStatus = (int)LocationStatusEnum.Lock;
                    BaseDal.UpdateData(location);
                    BaseDal.UpdateData(Towlocation);
                }
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
            return location;
        }

        public WebResponseContent GetLocationConfigs(int layer)
@@ -153,12 +224,12 @@
                                Row = i + 1,
                            };

    

                            locationInfo.Depth = 1;
                            locationInfo.LocationCode = $"{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}";
                            locationInfo.LocationName = $"{locationInfo.Row.ToString().PadLeft(3, '0')}行{locationInfo.Column.ToString().PadLeft(3, '0')}列{locationInfo.Layer.ToString().PadLeft(3, '0')}层";
                            
                           



                            locationInfos.Add(locationInfo);
                        }