blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
wanshenmean
2025-04-16 29f20b28392d212c04c0c40a512894f8622cfa53 
 CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs


@@ -20,6 +20,7 @@


    /// <returns>包含任务信息的响应内容</returns>


    public async Task<WebResponseContent> RequestInTask(RequestTaskDto input)


    {


        Console.WriteLine($"{JsonConvert.SerializeObject(input)}");


        // 创建一个WebResponseContent对象


        WebResponseContent content = new WebResponseContent();


        try


@@ -540,15 +541,6 @@


        {


            if (stationManager.stationType != 7) throw new Exception("错误的调取");




            // 从缓存中获取库存信息


            //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);


            //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();




            //var stockinfo1 = stockInfoList.OrderBy(x => x.CreateDate)


            //    .ToList();


            //var strings = stationManager.Roadway.Split(",");


            //var stockinfo = stockinfo1.Where(x => x.LocationInfo != null && !x.IsFull && strings.Contains(x.LocationInfo.RoadwayNo))


            //    .FirstOrDefault();


            var stockInfo = await QueryStockInfoForEmptyTrayFRAsync("CWSC1", "10086", input.ProductionLine);




            if (stockInfo == null) return null;


@@ -577,7 +569,6 @@


            location.LocationStatus = (int)LocationEnum.InStockDisable;


            _locationRepository.UpdateData(location);




            _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { task.PalletCode });


            return task;


        }


        catch (Exception ex)


@@ -987,23 +978,17 @@


            .Where(x => stackers.Contains(x.DeviceCode))


            .ToList().Select(x => x.DeviceCode).ToList();




        // 从缓存中获取库存信息


        IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);


        List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();


        var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()


                                .Includes(x => x.LocationInfo)


                                .Includes(x => x.StockInfoDetails)


                                .Where(x => x.AreaCode == areaCode && x.IsFull == false && x.ProductionLine == productLine)


                                .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))


                                .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 过滤条件


                                .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "空托盘"))


                                .OrderBy(x => x.CreateDate) // 排序


                                .FirstAsync();




        var result1 = stockInfoList.Where(x => x.ProductionLine == productLine)


            .Where(x => x.AreaCode == areaCode && x.IsFull == false)


            .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))


            .OrderBy(x => x.CreateDate) // 排序


            .ToList(); // 转换为列表




        var result = result1.Where(x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => y.MaterielCode == "空托盘"))


            .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 过滤条件


            .FirstOrDefault(); // 获取第一个元素




        if (result != null)


            _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });


        else


        if (result.IsNullOrEmpty())


            ConsoleHelper.WriteColorLine($"常温{productLine}空托盘库存不足", ConsoleColor.Red);




        return result;


@@ -1034,29 +1019,24 @@


                .Where(x => x.DeviceCode.Contains("CWSC")) // 过滤条件


                .ToList().Select(x => x.DeviceCode).ToList();




            // 从缓存中获取库存信息


            IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);


            List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();




            // 修改后的查询代码


            var stockInfo1 = stockInfoList


                .Where(x => x.ProductionLine == station.productLine)


                .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true)


                .OrderBy(x => x.OutboundTime)


                .ToList();


            var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()


                                .Includes(x => x.LocationInfo)


                                .Includes(x => x.StockInfoDetails)


                                .Where(x => x.ProductionLine == station.productLine)


                                .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true)


                                // 增加对 LocationInfo 的空值检查


                                .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)


                                // 增加对 LocationInfo 的空值检查


                                .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))


                                .OrderBy(x => x.OutboundTime)


                                .FirstAsync();




            var stockInfo = stockInfo1


                // 增加对 LocationInfo 的空值检查


                .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)


                // 增加对 LocationInfo 的空值检查


                .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))


                .FirstOrDefault();




            if (stockInfo == null) throw new Exception($"库内{station.productLine}无满足条件的库存可出库");


            if (stockInfo.IsNullOrEmpty()) throw new Exception($"CWSC3库内{station.productLine}无满足条件的库存可出库");




            DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.AreaId == 5 && x.LocationCode == stockInfo.LocationCode);




            Dt_StationManager OutStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == "1016" && x.stationType == 10 && x.Roadway == locationInfo.RoadwayNo && x.stationStatus == "1");


            Dt_StationManager OutStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == "1005" && x.stationType == 10 && x.Roadway == locationInfo.RoadwayNo && x.stationStatus == "1");




            // 创建新任务实例


            var task = new Dt_Task


@@ -1086,8 +1066,6 @@


            BaseDal.AddData(task);


            stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;


            _locationRepository.UpdateData(stockInfo.LocationInfo);




            _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode });




            _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(stockInfo.LocationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);