优化前端，修复库存托盘编号重复和WCS任务重发

xiazhengtongxue

2026-01-25 a7bd6e538027d876b3122f21c3b1d34663fb2f07

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

@@ -163,7 +163,7 @@
        public string AccessingTunnel(int WarehouseId, int LocationType)
        {
            List<Dt_LocationInfo> locationData = BaseDal.QueryData(x => x.WarehouseId == WarehouseId);
            var roadwayGroups = locationData.Where(x => x.LocationType == LocationType && x.EnableStatus== (int)EnableStatusEnum.Normal).GroupBy(x => x.RoadwayNo)
            var roadwayGroups = locationData.Where(x => x.LocationType == LocationType && x.LocationStatus== (int)LocationStatusEnum.Free && x.EnableStatus== (int)EnableStatusEnum.Normal).GroupBy(x => x.RoadwayNo)
            .Select(g => new
            {
                RoadwayNo = g.Key,
@@ -197,6 +197,11 @@
        public Dt_LocationInfo? ShallowGetLocation(string roadway, int Locationtype,int row ,int Layer, int Column)
        {
            return BaseDal.QueryData(x => x.RoadwayNo == roadway && x.LocationType == Locationtype && x.Row==row && x.Layer== Layer && x.Column== Column).FirstOrDefault();
        }

        public Dt_LocationInfo? FindStorageLocation(string LocationCode)
        {
            return BaseDal.QueryData(x => x.LocationCode == LocationCode).FirstOrDefault();
        }


@@ -267,7 +272,7 @@
            }
        }

        private int judgmentRow(string RoadwayNo, int locrow)
        public int judgmentRow(string RoadwayNo, int locrow)
        {
            if (RoadwayNo == "1" || RoadwayNo == "3")
            {
@@ -305,5 +310,147 @@

            public DateTime DateTime { get; set; }
        }



        public WebResponseContent GetArea()
        {
            // WarehouseId分组，然后是RoadwayNo
            var result = BaseDal.QueryData()
                .GroupBy(x => x.WarehouseId)
                .Select(g => new {
                    WarehouseId = g.Key,
                    RoadwayNo = g.Select(x => x.RoadwayNo).Distinct().ToList()
                })
                .ToList();
            return WebResponseContent.Instance.OK("成功", result);
        }

        public WebResponseContent GetLocationStatus(int WarehouseId, string RoadwayNo)
        {
            // æ ¼å¼{层,{这一层的列数据}}
            var locations = BaseDal.QueryData(x => x.WarehouseId == WarehouseId && x.RoadwayNo == RoadwayNo)
                .Select(x => new
                {
                    x.RoadwayNo,
                    x.LocationCode,
                    x.WarehouseId,
                    x.Row,
                    x.Column,
                    x.Layer,
                    x.Depth,
                    x.LocationType,
                    x.LocationStatus,
                    x.EnableStatus
                })
                .ToList();

            // å¦‚果没有找到数据，返回空列表而不是null
            if (locations == null || !locations.Any())
            {
                return WebResponseContent.Instance.OK("未找到对应巷道的货位数据", new List<object>());
            }

            // ä¿®æ”¹ä¸ºå±‚下面放所有列的信息
            var result = locations
                .GroupBy(x => x.Layer)  // æŒ‰å±‚分组
                .Select(layerGroup => new
                {
                    layer = layerGroup.Key,
                    columns = layerGroup.GroupBy(x => x.Column)  // æ¯å±‚中按列分组
                                       .Select(columnGroup => new
                                       {
                                           column = columnGroup.Key,
                                           depths = columnGroup.Select(d => new
                                           {
                                               row = d.Row,
                                               LocationCode = d.LocationCode,
                                               depth = d.Depth,
                                               locationType = d.LocationType,
                                               locationStatus = d.LocationStatus,
                                               enableStatus = d.EnableStatus
                                           }).ToList()
                                       }).ToList()
                }).ToList();

            return WebResponseContent.Instance.OK("成功", result);
        }

        public WebResponseContent GetWarehouseCapacity()
        {
            // æŸ¥è¯¢æ‰€æœ‰ä»“库的货位数据
            var allLocations = BaseDal.QueryData()
                .Select(x => new
                {
                    x.WarehouseId,
                    x.LocationStatus
                })
                .ToList();

            // å¦‚果没有数据，返回空列表
            if (allLocations == null || !allLocations.Any())
            {
                return WebResponseContent.Instance.OK("未找到任何货位数据", new List<object>());
            }

            // è®¡ç®—每个仓库的容量使用情况
            var result = allLocations
                .GroupBy(x => x.WarehouseId)
                .Select(g => new
                {
                    WarehouseId = g.Key,
                    FreeLocations = g.Count(x => x.LocationStatus == 0),
                    RemainingCapacityPercentage = (int)Math.Round((double)g.Count(x => x.LocationStatus == 0) / g.Count() * 100)
                })
                .ToList();

            return WebResponseContent.Instance.OK("成功", result);
        }

        /// <summary>
        /// ä¸€é”®å¯ç”¨å··é“所有货位
        /// </summary>
        /// <param name="warehouseId">仓库ID</param>
        /// <param name="roadwayNo">巷道编号</param>
        /// <returns></returns>
        public WebResponseContent EnableAllLocationsInRoadway(string roadwayNo)
        {
            if (string.IsNullOrEmpty(roadwayNo))
                return WebResponseContent.Instance.Error("巷道编号不能为空");

            var locations = Repository.QueryData(x =>
                x.RoadwayNo == roadwayNo &&
                x.EnableStatus != EnableStatusEnum.Normal.ObjToInt());

            if (locations == null || locations.Count == 0)
                return WebResponseContent.Instance.OK("该巷道没有需要启用的货位");

            locations.ForEach(x => x.EnableStatus = EnableStatusEnum.Normal.ObjToInt());
            Repository.UpdateData(locations);

            return WebResponseContent.Instance.OK($"成功启用巷道[{roadwayNo}]的{locations.Count}个货位");
        }

        /// <summary>
        /// ä¸€é”®ç¦ç”¨å··é“所有货位
        /// </summary>
        /// <param name="warehouseId">仓库ID</param>
        /// <param name="roadwayNo">巷道编号</param>
        /// <returns></returns>
        public WebResponseContent DisableAllLocationsInRoadway(string roadwayNo)
        {
            if (string.IsNullOrEmpty(roadwayNo))
                return WebResponseContent.Instance.Error("巷道编号不能为空");
            var locations = Repository.QueryData(x =>
                x.RoadwayNo == roadwayNo &&
                x.EnableStatus != EnableStatusEnum.Disable.ObjToInt());
            if (locations == null || locations.Count == 0)
                return WebResponseContent.Instance.OK("该巷道没有需要禁用的货位");
            // æ£€æŸ¥è´§ä½æ˜¯å¦æœ‰åº“å­˜
            var locationIds = locations.Select(x => x.Id).ToList();
            locations.ForEach(x => x.EnableStatus = EnableStatusEnum.Disable.ObjToInt());
            Repository.UpdateData(locations);
            return WebResponseContent.Instance.OK($"成功禁用巷道[{roadwayNo}]的{locations.Count}个货位");
        }
    }
}