dengjunjie
2025-03-13 90a0c4e0ab42a3574cfb6f9fd3b031dac9e7fb0d
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs
@@ -51,7 +51,7 @@
                    {
                        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();
                        if (locationCode.Count() == 2) location.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
                    }
                    //else
                    //{
@@ -72,6 +72,32 @@
            return content;
        }
        /// <summary>
        /// èŽ·å–å¯ç§»åº“è´§ä½
        /// </summary>
        /// <returns></returns>
        public Dt_LocationInfo AssignLocation()
        {
            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);
            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);
            return locationInfo;
        }
        public Dt_LocationInfo AssignLocation(string[] Stations)
        {
            Dt_LocationInfo? locationInfo = null;
            var locationInfos = BaseDal.QueryData(x => Stations.Contains(x.LocationCode) && x.CurrentQty < x.MaxQty - 1, _emptyAssignOrderBy);
            if (locationInfos != null && locationInfos.Count > 0)
                locationInfo = locationInfos[0];
            return locationInfo;
        }
        /// <summary>
        /// åˆ†é…è´§ä½
        /// </summary>
        /// <param name="stockInfo">组盘信息</param>
@@ -80,9 +106,17 @@
        /// <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);
            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);
            if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];
            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)
            {
                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), _emptyAssignOrderBy);
                if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];//需预留一个货位移库
            }
            return locationInfo;
        }
@@ -178,13 +212,9 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationCode == position);
                if (locationInfo == null) throw new Exception("未找到货位信息");
                //分配穿梭车移库地址
                var locationInfos = BaseDal.QueryData(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && x.LocationCode != locationInfo.LocationCode);//需根据入库逻辑改动
                var location = locationInfos.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
                //if (location != null) content.OK(message: location.LocationCode, data: location);
                if (location != null) content.OK(location.LocationCode);
                //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);
                Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.CurrentQty < x.MaxQty && x.LocationCode != position, _emptyAssignOrderBy);
                if (locationInfo != null) content.OK(locationInfo.LocationCode);
            }
            catch (Exception ex)
            {