代码逻辑优化

wankeda

2025-04-07 4da42c12efde190b208f18b7dd51d3e89986837d

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs

@@ -40,7 +40,7 @@
            try
            {
                Dt_RoadwayInfo roadwayInfo = _basicRepository.RoadwayInfoRepository.QueryFirst(x => x.InStationCode == stationCode) ?? throw new Exception("未找到该站台对应的巷道，请检查基础配置信息!");
                if (roadwayInfo.EnableStatus != EnableStatusEnum.Normal.ObjToInt() && roadwayInfo.EnableStatus != EnableStatusEnum.OnlyIn.ObjToInt())
                if (roadwayInfo.EnableStatus != EnableStatusEnum.Normal.ObjToInt() && roadwayInfo.EnableStatus != StatusEnum.OnlyIn.ObjToInt())
                {
                    throw new Exception("该巷道不可入库，请检查巷道禁用信息!");
                }
@@ -52,10 +52,10 @@
                        throw new Exception("区域被禁用，不可入库!");
                    }
                }
                if (inboundType == TaskTypeEnum.PalletInbound.ObjToInt())//空盘入库分配逻辑
                {
                    return EmptyAssignLocation(roadwayInfo.RoadwayNo);
                }
                //if (inboundType == TaskTypeEnum.PalletInbound.ObjToInt())//空盘入库分配逻辑
                //{
                //    return EmptyAssignLocation(roadwayInfo.RoadwayNo);
                //}
                else if (inboundType == TaskTypeEnum.Inbound.ObjToInt())
                {
                    return StoredAssignLocation(roadwayInfo.RoadwayNo);
@@ -75,42 +75,42 @@

        private Dt_LocationInfo EmptyAssignLocation(string roadway)
        {
            List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Pallet);
            List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, StatusEnum.Pallet);
            if (locationGroups != null && locationGroups.Count > 0)
            {
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x =>  x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt()|| x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt());
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x =>  x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt()|| x.EnableStatusA == StatusEnum.OnlyIn.ObjToInt());
                int id = locationGroup?.IdA ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }
            locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Free);
            //locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, StatusEnum.Free);
            if (locationGroups != null && locationGroups.Count > 0)
            {
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt());
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatusB == StatusEnum.OnlyIn.ObjToInt());
                int id = locationGroup?.IdB ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }

            return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()  && x.RoadwayNo == roadway), _emptyAssignOrderBy);
            return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatus == StatusEnum.OnlyIn.ObjToInt()  && x.RoadwayNo == roadway), _emptyAssignOrderBy);
        }

        private Dt_LocationInfo StoredAssignLocation(string roadway)
        {
            List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.InStock);
            List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, StatusEnum.InStock);
            if (locationGroups != null && locationGroups.Count > 0)
            {
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
                int id = locationGroup?.IdA ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }
            locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Free);
            locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, StatusEnum.Free);
            if (locationGroups != null && locationGroups.Count > 0)
            {
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
                int id = locationGroup?.IdB ?? 0;
                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.EnableStatus == StatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo == roadway), _emptyAssignOrderBy);
        }

        public Dt_LocationInfo AdjacentDepthLocation(string locationCode)
@@ -182,7 +182,7 @@
                }
                else
                {
                    if (result != null&&(result.LocationStatus== LocationStatusEnum.Lock.ObjToInt()|| result.LocationStatus==LocationStatusEnum.PalletLock.ObjToInt()))
                    if (result != null&&(result.LocationStatus== LocationStatusEnum.Lock.ObjToInt()|| result.LocationStatus== StatusEnum.PalletLock.ObjToInt()))
                    {
                        int beforeStatusEnd = result.LocationStatus;

@@ -227,10 +227,10 @@

                locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();

                if (beforeStartStatus == LocationStatusEnum.Pallet.ObjToInt())
                if (beforeStartStatus == StatusEnum.Pallet.ObjToInt())
                {
                    locationInfos.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
                    locationInfo.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
                    locationInfos.LocationStatus = StatusEnum.PalletLock.ObjToInt();
                    locationInfo.LocationStatus = StatusEnum.PalletLock.ObjToInt();
                }
                else
                {
@@ -261,7 +261,7 @@
                }
                else
                {
                    locations.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
                    locations.LocationStatus = StatusEnum.Pallet.ObjToInt();
                }