优化代码

dengjunjie

2025-04-26 18d2f40bbf40469b033de6f07ca8a8e3bc191132

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs

@@ -81,12 +81,12 @@
            Dt_LocationInfo? locationInfo = null;
            string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//获取穿梭车充电位置
            var ChargingStations = CarChargingStation.Split(",");
            locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.Row == 3, _emptyAssignOrderBy);
            locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.Row == 2, _emptyAssignOrderBy);

            if (locationInfo == null)
                locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && 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 => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 2), _emptyAssignOrderBy);
            //if (locationInfo == null)
            //    locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 2), _emptyAssignOrderBy);
            return locationInfo;
        }

@@ -102,14 +102,13 @@
        /// èŽ·å–空托货位
        /// </summary>
        /// <returns></returns>
        public Dt_LocationInfo GetLocationPallet()
        public List<Dt_LocationInfo> GetLocationPallet()
        {
            string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//获取穿梭车充电位置
            var ChargingStations = CarChargingStation.Split(",");
            Dt_LocationInfo? locationInfo = null;
            var locationInfos = BaseDal.QueryData(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt() && x.CurrentQty < x.MaxQty, _emptyAssignOrderBy);
            if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];
            return locationInfo;
            return BaseDal.QueryData(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt() && x.CurrentQty < x.MaxQty, _emptyAssignOrderBy);
            //if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];
            //return locationInfo;
        }
        /// <summary>
        /// åˆ†é…è´§ä½
@@ -123,7 +122,7 @@
            string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//获取穿梭车充电位置
            var ChargingStations = CarChargingStation.Split(",");
            Dt_LocationInfo? locationInfo = null;
            var locationInfos = BaseDal.QueryData(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.CurrentQty < 1 && x.Row == (inboundOrderCount > 1 ? 1 : 3), _emptyAssignOrderBy);
            var locationInfos = BaseDal.QueryData(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.CurrentQty < 1 && x.Row == (inboundOrderCount > 1 ? 1 : 2), _emptyAssignOrderBy);
            if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];

            if (locationInfo == null)
@@ -229,12 +228,12 @@
                Dt_LocationInfo? locationInfo = null;
                //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);
                string position2 = string.Empty;
                string[] Codes = position1.Split("-");
                var row = Convert.ToInt16(Codes[0]);
                if (row < 3)
                {
                    position2 = row == 1 ? "002" + "-" + Codes[1] + "-" + Codes[2] : "001" + "-" + Codes[1] + "-" + Codes[2];
                }
                //string[] Codes = position1.Split("-");
                //var row = Convert.ToInt16(Codes[0]);
                //if (row < 3)
                //{
                //    position2 = row == 1 ? "002" + "-" + Codes[1] + "-" + Codes[2] : "001" + "-" + Codes[1] + "-" + Codes[2];
                //}
                if (string.IsNullOrEmpty(position2))
                {
                    locationInfo = BaseDal.QueryFirst(x => x.CurrentQty < x.MaxQty && x.LocationCode != position && x.LocationCode != position1, _emptyAssignOrderBy);