百步立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
刘磊
2024-11-20 2db8aa13565b87f9c92b94021b71020490a217de 
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs


@@ -1,6 +1,7 @@


using log4net.Core;


using Mapster;


using Masuit.Tools;


using Masuit.Tools.Models;


using WIDESEA_DTO.MOM;


using WIDESEA_DTO.WMS;


using WIDESEA_IStorageBasicRepository;


@@ -12,7 +13,7 @@




namespace WIDESEA_StorageOutTaskServices;




public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService


public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService


{


    private readonly LogFactory LogFactory = new LogFactory();


    private readonly IUnitOfWorkManage _unitOfWorkManage;


@@ -92,11 +93,11 @@


        {


            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)


            {


                var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()


                    .FirstAsync(x => x.EquipmentName == task.Roadway);


                var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);


                //var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()


                //    .FirstAsync(x => x.EquipmentName == task.Roadway);


                //var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);




                var agingOutputDto = MapToAgingOutputDto(stock, info);


                var agingOutputDto = MapToAgingOutputDto(stock);


                content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);


                ValidateResponse(content);


            }


@@ -122,30 +123,37 @@


        }


    }




    private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info)


    private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info = null)


    {


        // TODO Value值根据MOM下发的静置时间到当前时间的分钟数


        var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);


        if (area == null)


        {


            throw new Exception("未找到对应的库区信息");


        }


        return new AgingOutputDto


        {


            OpFlag = 1,


            Software = "WMS",


            EquipmentCode = "ECH001-B",


            Software = area.Spare3,


            EquipmentCode = area.Spare2,


            TrayBarcode = stock.PalletCode,


            SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto


            {


                SlotNo = x.OrderNo.ToInt32(),


                SerialNo = x.SerialNumber,


                SerialNoResult = true,


                ParameterInfo = info.ParameterInfo.Select(x => new ParameterInfo()


                {


                    LowerLomit = x.LowerControlLimit,


                    UpperLimit = x.UpperControlLimit,


                    ParameterResult = x.EquipmentAvailabilityFlag,


                    ParameterCode = x.ParameterCode,


                    ParameterDesc = x.Description,


                    TargetValue = x.TargetValue,


                    Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString(),


                    DefectCode = x.UOMCode


                }).ToList()


                ParameterInfo = new List<ParameterInfo> { new ParameterInfo() { Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString() } }


                //ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()


                //{


                //    LowerLomit = y.LowerControlLimit,


                //    UpperLimit = y.UpperControlLimit,


                //    ParameterResult = y.EquipmentAvailabilityFlag,


                //    ParameterCode = y.ParameterCode,


                //    ParameterDesc = y.Description,


                //    TargetValue = y.TargetValue,


                //    Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),


                //    DefectCode = y.UOMCode


                //}).ToList()


            }).ToList()


        };


    }


@@ -287,6 +295,7 @@


            // 记录异常信息到控制台和日志


            Console.WriteLine(err.Message.ToString());


            LogFactory.GetLog("任务完成").Error(true, err);


            content.Error(err.Message);


        }


        return content;


    }


@@ -296,6 +305,8 @@


    /// </summary>


    private DtStockInfo CreateEmptyPalletStock(Dt_Task task, DtLocationInfo locationInf)


    {


        var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);


        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);


        return new DtStockInfo()


        {


            PalletCode = task.PalletCode,


@@ -303,13 +314,15 @@


            CreateDate = DateTime.Now,


            Creater = "system",


            IsFull = false,


            AreaCode = task.Roadway,


            AreaCode = area.AreaCode,


            LocationId = loation.Id,


            StockInfoDetails = new List<DtStockInfoDetail>()


            {


                new DtStockInfoDetail()


                {


                    MaterielCode = "空托盘",


                    Id = 0,


                    Status = (int)StockStateEmun.已入库


                }


            }


        };


@@ -320,7 +333,14 @@


    /// </summary>


    private DtStockInfo CreateFullPalletStock(Dt_Task task, DtLocationInfo locationInf, DtBoxingInfo boxing)


    {


        var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);


        if (loation == null)


            throw new Exception("未找到对应位置信息");


        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);


        if (area == null)


            throw new Exception("未找到对应区域信息");


        var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();


        boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.已入库; });


        var stock = new DtStockInfo()


        {


            PalletCode = task.PalletCode,


@@ -328,7 +348,8 @@


            CreateDate = DateTime.Now,


            Creater = "system",


            IsFull = boxing.IsFull,


            AreaCode = task.Roadway,


            AreaCode = area.AreaCode,


            LocationId = loation.Id,


            StockInfoDetails = boxDetail,


        };




@@ -340,12 +361,16 @@


                .ToList(),


            TrayBarcode = task.PalletCode,


            OpFlag = 1,


            EquipmentCode = "ECH001-B",


            Software = "WMS"


            EquipmentCode = area.Spare2,


            Software = area.Spare3


        };


        var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;


        var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());


        stock.Remark = respone.LinedProcessFeedbackTime;


        stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;


        stock.SpecialParameterDuration = respone.SpecialParameterDuration;


        //2024年11月16日：新增字段计算应出库时间


        stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));


        stock.ProductionLine = respone.ProductionLine;




        // 记录日志


        LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务完成", $"货位地址：{task.TargetAddress},修改后货位数据：{locationInf}");


@@ -437,12 +462,18 @@


                    return content.OK(data: taskDTO);


                }


            }




            var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));


            if (area == null)


                return content.Error("改点位不在区域列表中存在");




            // 创建一个TrayCellsStatusDto对象，并赋值


            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()


            {


                Software = "WMS",


                Software = area.Spare3,


                TrayBarcode = input.PalletCode,


                EquipmentCode = "ECH001-B"


                //EquipmentCode = "EQ_CWJZ01"


                EquipmentCode = area.Spare2


            };




            // 调用GetTrayCellStatusAsync方法，获取整盘电芯


@@ -457,9 +488,9 @@


                return content.Error(result.MOMMessage);




            // TODO 获取本地料框属性与整盘电芯属性获取的值进行对比，如果一致则继续，否则返回错误信息


            var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));


            if (productions.Count <= 0)


                return content.Error("料框属性不存在");


            //var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));


            //if (productions.Count <= 0)


            //    return content.Error("料框属性不存在");




            // 调用CreateBoxingInfo方法，创建组盘信息




@@ -472,6 +503,12 @@


            // 如果process为null，则返回content


            if (process == null) return content;




            // 并赋值上位软件名称和设备编码


            process.Software = area.Spare3;


            process.EquipmentCode = area.Spare2;




            // 调用GetProcessApplyAsync方法，获取工艺申请




            // 调用_processApplyService.GetProcessApplyAsync方法，获取工艺申请


            content = await _processApplyService.GetProcessApplyAsync(process);




@@ -483,7 +520,7 @@




            List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };


            // 调用CreateNewTask方法，创建新任务


            content =  await CreateNewTask(input, strings);


            content = await CreateNewTask(input, strings);


            if (content.Status)


            {


                var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);


@@ -555,7 +592,11 @@


                return content.OK(data: task);


            }




            return await CreateNewTask(input, null, 1);


            // 获取目标地址


            List<string> strings = input.Position == "1016" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };




            return await CreateNewTask(input, strings, 1);


            //return await CreateNewTask(input, null, 1);


        }


        catch (Exception)


        {


@@ -595,8 +636,6 @@


        // 创建一个ProcessApplyDto对象，并赋值


        return new ProcessApplyDto()


        {


            EquipmentCode = "ECH001-B",


            Software = "WMS",


            //WipOrderNo = result.BindCode,


            SerialNos = content.SerialNos.Select(item => new SerialNos


            {


@@ -656,12 +695,20 @@


        {


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


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


                ? QueryStockInfoForRealTray(areaCode, roadways)


                : QueryStockInfoForEmptyTray(areaCode, roadways);


                ? QueryStockInfoForRealTrayAsync(areaCode, roadways).Result


                : QueryStockInfoForEmptyTrayAsync(areaCode, roadways).Result;




            if (stockInfo == null)


            {


                return content.Error("库存信息不存在");


            }




            // 新增重复任务校验


            var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);


            if (hasTask != null)


            {


                WMSTaskDTO taskDTO1 = CreateTaskDTO(hasTask);


                return content.OK("已存在空盘出库任务", data: taskDTO1);


            }




            // 创建新任务实例


@@ -696,25 +743,43 @@


    /// <summary>


    /// 查询实盘库存信息


    /// </summary>


    private DtStockInfo QueryStockInfoForRealTray(string areaCode, List<string> roadways)


    private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)


    {


        return _stockInfoRepository.Db.Queryable<DtStockInfo>().Where(x => x.AreaCode == areaCode && Convert.ToDateTime(x.Remark) < DateTime.Now && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))


                                   .Includes(x => x.LocationInfo)


                                   .Includes(x => x.StockInfoDetails)


                                   .OrderBy(x => x.CreateDate)


                                   .First();


        var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);




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


            .Includes(x => x.LocationInfo) // 预加载LocationInfo


            .Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails


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


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


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


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




        //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 查找第一个匹配的元素


        //var firstOrDefault = result[0]; // 查找第一个匹配的元素


        //return firstOrDefault;


        return result;


    }




    /// <summary>


    /// 查询空盘库存信息


    /// </summary>


    private DtStockInfo QueryStockInfoForEmptyTray(string areaCode, List<string> roadways)


    private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)


    {


        return _stockInfoRepository.Db.Queryable<DtStockInfo>().Where(x => x.AreaCode == areaCode && x.StockInfoDetails.Any(z => z.MaterielCode == "空托盘") && roadways.Contains(x.LocationInfo.RoadwayNo))


                                   .Includes(x => x.LocationInfo)


                                   .Includes(x => x.StockInfoDetails)


                                   .OrderBy(x => x.CreateDate)


                                   .First();


        var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);




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


            .Includes(x => x.LocationInfo) // 预加载LocationInfo


            .Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails


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


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


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


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


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




        //var firstOrDefault = result[0]; // 查找第一个匹配的元素


        //return firstOrDefault;


        return result;


    }




    /// <summary>


@@ -779,7 +844,7 @@


            if (task == null)


                return content.Error("未找到任务");




            if (taskState == (int)TaskOutStatusEnum.Line_OutFinish)


            if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskOutStatusEnum.SC_OutFinish)


            {


                var taskHty = CreateHistoricalTask(task);


                await _unitOfWorkManage.UseTranAsync(async () =>


@@ -940,7 +1005,7 @@


    /// <returns>是否更新成功</returns>


    public async Task<bool> Update(Dt_Task model)


    {


        return await BaseDal.Update(model);


        return await BaseDal.UpdateDataAsync(model);


    }




    /// <summary>


@@ -950,7 +1015,7 @@


    /// <returns>是否更新成功</returns>


    public async Task<bool> Update(List<Dt_Task> models)


    {


        return await BaseDal.Update(models);


        return await BaseDal.UpdateDataAsync(models);


    }




    /// <summary>


@@ -970,7 +1035,7 @@


    /// <returns></returns>


    public async Task<Dt_Task> GetByLocation(string locationID)


    {


        return await Db.Queryable<Dt_Task>().Where(x => x.SourceAddress == locationID).FirstAsync();


        return await BaseDal.QueryFirstAsync(x => x.SourceAddress == locationID);


    }




    /// <summary>


@@ -980,7 +1045,7 @@


    /// <returns></returns>


    public async Task<Dt_Task> GetByTaskNum(int taskNum)


    {


        return await Db.Queryable<Dt_Task>().Where(x => x.TaskNum == taskNum).FirstAsync();


        return await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);


    }




    #endregion 内部调用方法


@@ -1208,7 +1273,8 @@


        WebResponseContent content = new WebResponseContent();




        // 获取目标地址


        string ToAddress = await GetRoadWayAsync(process);


        //string ToAddress = await GetRoadWayAsync(process);


        string ToAddress = await GetRoadWayAsync(input, process);




        // 创建新任务实例


        var task = new Dt_Task


@@ -1264,16 +1330,25 @@


    /// <summary>


    /// 查找货位


    /// </summary>


    /// <param name="areaId">区域主键</param>


    /// <param name="IsFull">区域主键</param>


    /// <param name="roadWay">巷道</param>


    /// <returns></returns>


    public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay)


    public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay, bool IsFull = true)


    {


        #region 获取货位




        try


        {


            var locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);


            List<DtLocationInfo> locations;


            if (IsFull)


            {


                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);


            }


            else


            {


                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay /*&& x.LocationType ==*/);


            }




            if (locations == null)


            {


                return null;


@@ -1298,10 +1373,10 @@


    /// <param name="Direction">方向</param>


    /// <param name="area">关系区域</param>


    /// <returns></returns>


    public async Task<string> GetRoadWayAsync(List<string> process)


    public async Task<string> GetRoadWayAsync(RequestTaskDto input, List<string> process)


    {


        var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)


            .GroupBy(x => x.RoadwayNo)


             .GroupBy(x => x.RoadwayNo)


             .OrderByDescending(g => g.Count()) // 根据每个组的元素数量排序


             .First(); // 取出数量最多的组