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


@@ -1,13 +1,16 @@


using Mapster;


using Masuit.Tools;


using SixLabors.Fonts.Tables.AdvancedTypographic;


using SqlSugar;


using System.Text.RegularExpressions;


using WIDESEA_Cache;


using WIDESEA_Core;


using WIDESEA_Core.Const;


using WIDESEA_DTO.MOM;


using WIDESEA_DTO.WMS;


using WIDESEA_IServices;


using WIDESEA_IStoragIntegrationServices;


using WIDESEA_Model.Models;


using WIDESEAWCS_BasicInfoRepository;


using WIDESEAWCS_QuartzJob.Models;




@@ -135,20 +138,6 @@


                await DeleteTaskAsync(task.TaskId);


                await AddTaskHtyAsync(taskHty);


            });


            try


            {


                //using (_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))


                //{


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


                //}


            }


            catch (Exception ex)


            {


                LogFactory.GetLog("删除缓存失败").Error(true, $"{stock.PalletCode}_删除缓存失败，异常信息：{ex.Message}");


                //using (_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))


                //{


                //}


            }




            return content.OK("任务完成成功", task.Remark);


        }


@@ -386,16 +375,6 @@




                stock.StockInfoDetails = new List<DtStockInfoDetail>() { { stock.StockInfoDetails[0] } };


                stock.LocationInfo = locationInf;


                //using(_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))


                //{


                try


                {


                    _simpleCacheService.HashAdd(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, stock.PalletCode, stock);


                }


                catch (Exception ex)


                {


                    LogFactory.GetLog("添加缓存失败").Error(true, $"{stock.PalletCode}_添加缓存失败，异常信息：{ex.Message}");


                }




                content.OK("入库任务完成成功");


            }


@@ -893,6 +872,8 @@


        WebResponseContent content = new WebResponseContent();


        try


        {


            // 记录异常信息并抛出


            LogFactory.GetLog($"{position}请求{productionLine}任务").Info(true, $"{position}-{tag}-{areaCode}-{JsonConvert.SerializeObject(areaCodes)}-{productionLine}");


            // 根据托盘类型查询库存信息


            DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound


                ? areaCode != "CWSC1" ? await QueryStockInfoForRealTrayAsync(areaCode, areaCodes, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine)


@@ -964,34 +945,27 @@


                                  .ToList()


                : null;




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


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


            var result = new DtStockInfo();




            //if (stockInfoList.IsNullOrEmpty())


            //{


            //    stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>()


            //        .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).IncludesAllFirstLayer().ToListAsync();


            //}


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


                            .Includes(x => x.LocationInfo)


                            .Includes(x => x.StockInfoDetails)


                            .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)


                            .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)


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


                            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)


                            .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))


                            .OrderBy(x => x.OutboundTime)


                            .FirstAsync();




            result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)


                              .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)


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


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


                              .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))


                              .OrderBy(x => x.OutboundTime)


            .FirstOrDefault();




            if (result != null)


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


            else


                ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayAsync查询实盘库存信息失败:未找到符合条件的数据");


            if (result.IsNullOrEmpty())


                ConsoleHelper.WriteErrorLine($"{area.AreaName}-{productionLine}查询实盘库存信息失败:未找到符合条件的数据");




            return result;


        }


        catch (Exception ex)


        {


            ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayAsync查询实盘库存信息失败:" + ex.Message + "\r\n" + ex.StackTrace);


            ConsoleHelper.WriteErrorLine("查询实盘库存信息失败:" + ex.Message + "\r\n" + ex.StackTrace);


            return null;


        }


    }


@@ -1028,27 +1002,20 @@


                .Where(x => x.DeviceStatus == "1")


                .Where(x => x.DeviceCode.Contains("CWSC"))


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


            //var deviceCode = devices.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 = stockInfoList.Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 过滤条件


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


                .Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 过滤条件


                .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)


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


                .Includes(x=>x.LocationInfo)


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


                .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))


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


                .Includes(x=>x.StockInfoDetails)


                .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))


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


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


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




            if (result != null)


            {


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


            }


            else


            {


                ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayCWAsync查询常温实盘库存信息失败:未找到符合条件的数据");


            }


            if (result.IsNullOrEmpty())


                ConsoleHelper.WriteErrorLine($"{JsonConvert.SerializeObject(areaCodes)}-{productionLine}查询常温实盘库存信息失败:未找到符合条件的数据");




            return result;


        }


@@ -1079,27 +1046,25 @@


                .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 = stockInfoList.Where(x => x.ProductionLine == station.productLine)


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


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


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


                .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) // 过滤条件


                .Includes(x=>x.StockInfoDetails)


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


                .Includes(x=>x.LocationInfo)


                .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) // 过滤条件


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


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


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




            if (result != null)


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


            else


                ConsoleHelper.WriteErrorLine("QueryStockInfoForEmptyTrayAsync查询空盘库存信息失败:未找到符合条件的数据");


            if (result.IsNullOrEmpty())


                ConsoleHelper.WriteErrorLine($"{area}-{station.productLine}查询空盘库存信息失败:未找到符合条件的数据");




            return result;


        }


        catch (Exception ex)


        {


            ConsoleHelper.WriteErrorLine("QueryStockInfoForEmptyTrayAsync查询实盘库存信息失败:" + ex.Message + "\r\n" + ex.StackTrace);


            ConsoleHelper.WriteErrorLine($"QueryStockInfoForEmptyTrayAsync查询实盘库存信息失败:" + ex.Message + "\r\n" + ex.StackTrace);


            return null;


        }


    }


@@ -1237,15 +1202,15 @@


            if (stockInfo.AreaCode.Contains("CH"))


            {


                // 创建并添加任务到数据库


                task = CreateTask(stockInfo, "1020-1", taskType);


                task = CreateTask(stockInfo, "002-071-001", taskType);


            }


            else


            {


                if (stockInfo.LocationInfo.RoadwayNo.Contains("JZSC"))


                {


                    var targetAddress = "002-021-001";


                    if (stockInfo.LocationInfo.RoadwayNo == "JZSC4")


                        targetAddress = "001-021-001";


                    var targetAddress = "001-061-001";


                    //if (stockInfo.LocationInfo.RoadwayNo == "JZSC4")


                    //    targetAddress = "001-021-001";


                    task = CreateTask(stockInfo, targetAddress, taskType);


                }


            }


@@ -1611,6 +1576,41 @@




    #endregion 外部接口方法




    #region  静置查询实托


    public async Task<WebResponseContent> QueryStockInfoForRealTrayJZAsync(string ProductLine, string PalletCode)


    {


        WebResponseContent content = new WebResponseContent();


        try


        {


            var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()


                .Where(x => x.DeviceStatus == "1")


                .Where(x => x.DeviceCode.Contains("JZSC"))


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




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


                .Where(x=> x.IsFull == true) // 过滤条件


                .WhereIF(!ProductLine.IsNullOrEmpty(), x => x.ProductionLine == ProductLine)


                .Includes(x => x.LocationInfo)


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


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


                .Includes(x => x.StockInfoDetails)


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


                .FirstAsync();


            if (result.IsNullOrEmpty())


                content.Error();


            else


                content.OK();


            LogFactory.GetLog($"静置查询实盘库存{ProductLine}").Info(true, $"托盘号：{JsonConvert.SerializeObject(result.PalletCode)}-----产线{JsonConvert.SerializeObject(result.ProductionLine)}");


        }


        catch (Exception ex)


        {


            return content.Error(ex.Message);


        }


        return content;


    }




    #endregion




    #endregion 外部接口方法




    #region 内部调用方法