添加 ProductionLine 属性并优化任务处理逻辑

肖洋

2025-02-11 992a33ca68af405d08da512c46d7d59ec3ceaabc

添加 ProductionLine 属性并优化任务处理逻辑

在多个文件中添加了 `ProductionLine` 属性，以支持任务的创建和更新。更新了相关方法的参数和返回值，确保在处理任务时正确使用该属性。同时，简化了代码，移除了冗余的赋值，并新增了托盘状态检查逻辑。所有更改旨在提高代码的可读性、维护性和系统的整体性能。

添加 ProductionLine 属性并更新相关逻辑

在多个文件中添加了 ProductionLine 属性，并对现有属性进行了格式化和注释。更新了任务创建和更新逻辑，以支持新属性的处理。修改了 WMSTaskDTO 的创建方式，确保 ProductionLine 被正确赋值。新增了查询空盘库存信息的方法，并在相关方法中更新了参数传递，确保逻辑一致性和正确性。这些更改旨在提高代码的可读性、维护性和系统性能。

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs

@@ -11,17 +11,17 @@
        /// <summary>
        /// WMS任务主键
        /// </summary>
        public int Id {  get; set; }
        public int Id { get; set; }

        /// <summary>
        /// ä»»åŠ¡å·
        /// </summary>
        public int TaskNum {  get; set; }
        public int TaskNum { get; set; }

        /// <summary>
        /// æ‰˜ç›˜å·
        /// </summary>
        public string PalletCode {  get; set; }
        public string PalletCode { get; set; }

        /// <summary>
        /// å··é“号
@@ -31,7 +31,7 @@
        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        public int TaskType {  get; set; }
        public int TaskType { get; set; }

        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€
@@ -41,16 +41,21 @@
        /// <summary>
        /// èµ·ç‚¹
        /// </summary>
        public string SourceAddress {  get; set; }
        public string SourceAddress { get; set; }

        /// <summary>
        /// ç»ˆç‚¹
        /// </summary>
        public string TargetAddress {  get; set; }
        public string TargetAddress { get; set; }

        /// <summary>
        /// ä¼˜å…ˆçº§
        /// </summary>
        public int Grade {  get; set; }
        public int Grade { get; set; }

        /// <summary>
        /// å¤‡  æ³¨: æ‰˜ç›˜äº§çº¿
        ///</summary>
        public string? ProductionLine { get; set; }
    }
}
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs

@@ -148,5 +148,13 @@
        [ExporterHeader(DisplayName = "备注")]
        [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "备注")]
        public string Remark { get; set; }

        /// <summary>
        /// æ‰˜ç›˜äº§çº¿
        /// </summary>
        [ImporterHeader(Name = "托盘产线")]
        [ExporterHeader(DisplayName = "托盘产线")]
        [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "托盘产线")]
        public string ProductionLine { get; set; }
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs

@@ -282,7 +282,7 @@
            }
            var wmsIpAddrss = wmsBase + requestTask;

            var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = "", EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode }.ToJsonString());
            var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = "", EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode, ProductionLine = stationManager.productLine }.ToJsonString());
            WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
            if (!content.Status)
            {

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/WMS/WMSTaskDTO.cs

@@ -1,4 +1,5 @@
using System;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -52,5 +53,10 @@
        /// ä¼˜å…ˆçº§
        /// </summary>
        public int Grade { get; set; }

        /// <summary>
        /// å¤‡  æ³¨: æ‰˜ç›˜äº§çº¿
        ///</summary>
        public string? ProductionLine { get; set; }
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs

@@ -122,6 +122,13 @@
    public string? ErrorMessage { get; set; }

    /// <summary>
    /// å¤‡  æ³¨: æ‰˜ç›˜äº§çº¿
    /// é»˜è®¤å€¼:
    ///</summary>
    [SugarColumn(ColumnName = "ProductionLine", Length = 20, IsNullable = true)]
    public string? ProductionLine { get; set; }

    /// <summary>
    /// ä»»åŠ¡æ‰§è¡Œæ˜Žç»†
    /// </summary>
    [SugarColumn(ColumnName = "任务执行明细")]

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs

@@ -79,6 +79,7 @@
        /// </summary>
        [ImporterHeader(Name = "生产产线")]
        [ExporterHeader(DisplayName = "生产产线")]
        [SugarColumn(IsNullable = true, ColumnDescription = "生产产线")]
        public string ProductionLine { get; set; }

        /// <summary>

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -478,6 +478,7 @@
            IsFull = false,
            AreaCode = area.AreaCode ?? "",
            LocationId = loation.Id,
            ProductionLine = task.ProductionLine,
            StockInfoDetails = new List<DtStockInfoDetail>()
            {
                new DtStockInfoDetail()
@@ -760,7 +761,7 @@
                {
                    NGStation = efg.Select(x => x.stationNGChildCode).ToList();
                }
                content = await CreateNewTask(input, NGStation, 2);
                content = await CreateNewTask(input, result.ProductionLine, NGStation, 2);
                return content.Error("存在异常电芯");
            }

@@ -797,7 +798,7 @@
                {
                    // TODO é€è‡³åŒ…装
                    List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
                    content = await CreateNewTask(input, strings, 3);
                    content = await CreateNewTask(input, result.ProductionLine, strings, 3);
                    return content;
                }
                else
@@ -805,7 +806,7 @@
                    var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
                    var strings = config.ConfigValue.Split(',').ToList();
                    // TODO å…¥åº“
                    content = await CreateNewTask(input, strings);
                    content = await CreateNewTask(input, result.ProductionLine, strings);
                    if (content.Status)
                        await _boxingInfoRepository.AddDataNavAsync(boxing);
                }
@@ -894,7 +895,7 @@
                List<string> strings = stationManagers.Roadway.Split(',').ToList();
                Console.WriteLine(strings.ToJsonString() + "b-----------------------");
                //// è°ƒç”¨CreateNewTask方法，创建新任务
                content = await CreateNewTask(input, strings);
                content = await CreateNewTask(input, result.ProductionLine, strings);
                if (content.Status)
                {
                    var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -950,6 +951,7 @@
                    Creater = "System", // ä¿®æ­£æ‹¼å†™é”™è¯¯
                    CreateDate = DateTime.Now,
                    TaskId = 0,
                    ProductionLine = stock.ProductionLine,
                };

                var taskDTO = CreateTaskDTO(taskNew);
@@ -1073,20 +1075,46 @@
            if (task != null && task.TaskState == (int)TaskInStatusEnum.InNew)
            {
                // åˆ›å»ºWMS任务
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    TaskNum = task.TaskNum.Value,
                    Grade = 1,
                    PalletCode = task.PalletCode,
                    RoadWay = task.Roadway,
                    SourceAddress = task.SourceAddress,
                    TargetAddress = task.Roadway,
                    TaskState = task.TaskState.Value,
                    Id = 0,
                    TaskType = task.TaskType,
                };
                WMSTaskDTO taskDTO = CreateTaskDTO(task);
                //WMSTaskDTO taskDTO = new WMSTaskDTO()
                //{
                //    TaskNum = task.TaskNum.Value,
                //    Grade = 1,
                //    PalletCode = task.PalletCode,
                //    RoadWay = task.Roadway,
                //    SourceAddress = task.SourceAddress,
                //    TargetAddress = task.Roadway,
                //    TaskState = task.TaskState.Value,
                //    Id = 0,
                //    TaskType = task.TaskType,
                //};
                return content.OK(data: task);
            }

            // æ ¹æ®ä½ç½®æŸ¥è¯¢åŒºåŸŸä¿¡æ¯
            var areaCode = Regex.Replace(input.Position, @"-(\d+)", "");
            var area = await QueryAreaInfoByPosition(areaCode);
            if (area == null)
            {
                return content.Error("该点位不在区域列表中存在");
            }

            // èŽ·å–整盘电芯属性状态
            TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, input.PalletCode);
            content = await GetTrayCellStatusAsync(trayCells);
            if (!content.Status)
            {
                ConsoleHelper.WriteErrorLine($"获取电芯状态失败:{content.Message}");
                return content;
            }

            var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
            if (result.ProductionLine.IsNullOrEmpty())
            {
                ConsoleHelper.WriteErrorLine($"当前托盘无产线,联系MOM添加产线");
                return content.Error("当前托盘无产线,联系MOM添加产线");
            }


            var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
            if (stationManagers == null)
@@ -1096,9 +1124,8 @@
                    throw new Exception("未找到空托盘入库站台和入库站台配置");
            }
            List<string> strings = stationManagers.Roadway.Split(',').ToList();
            //Console.WriteLine(strings.ToJsonString() + "b-----------------------");

            return await CreateNewTask(input, strings, 1);
            return await CreateNewTask(input, result.ProductionLine, strings, 1);
        }
        catch (Exception)
        {
@@ -1173,6 +1200,9 @@
            {
                return content.Error("库存信息不存在");
            }

            //ConsoleHelper.WriteColorLine(JsonConvert.SerializeObject(stockInfo), ConsoleColor.DarkMagenta);


            // æ–°å¢žé‡å¤ä»»åŠ¡æ ¡éªŒ
            var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
@@ -1293,6 +1323,7 @@
        var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
            .Includes(x => x.LocationInfo) // é¢„加载LocationInfo
            .Includes(x => x.StockInfoDetails) // é¢„加载StockInfoDetails
            .Where(x => x.ProductionLine == station.productLine)
            .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 && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // è¿‡æ»¤æ¡ä»¶
@@ -1328,6 +1359,7 @@
            Creater = "System", // ä¿®æ­£æ‹¼å†™é”™è¯¯
            CreateDate = DateTime.Now,
            TaskId = 0,
            ProductionLine = stockInfo.ProductionLine,
        };
    }

@@ -1347,6 +1379,7 @@
            TaskState = task.TaskState.Value,
            Id = 0,
            TaskType = task.TaskType,
            ProductionLine = task.ProductionLine,
        };
    }

@@ -1695,7 +1728,8 @@
                        TaskState = (int)TaskInStatusEnum.Line_InFinish,
                        TaskType = (int)TaskInboundTypeEnum.Inbound,
                        TaskNum = await BaseDal.GetTaskNo(),
                        Creater = "Systeam"
                        Creater = "Systeam",
                        ProductionLine = result.ProductionLine
                    };

                    // åˆ›å»ºWMS任务
@@ -1731,7 +1765,8 @@
                        TaskState = (int)TaskInStatusEnum.Line_InFinish,
                        TaskType = (int)TaskInboundTypeEnum.InTray,
                        TaskNum = await BaseDal.GetTaskNo(),
                        Creater = "Systeam"
                        Creater = "Systeam",
                        ProductionLine = result.ProductionLine
                    };
                    // åˆ›å»ºWMS任务
                    WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
@@ -1779,6 +1814,7 @@
                TaskState = taskOld.TaskState.Value,
                Id = 0,
                TaskType = taskOld.TaskType,
                ProductionLine = taskOld.ProductionLine
            };
        }
        else if (source is Dt_Task task)
@@ -1794,6 +1830,7 @@
                TaskState = task.TaskState.Value,
                Id = 0,
                TaskType = task.TaskType,
                ProductionLine = task.ProductionLine
            };
        }
        else
@@ -2060,16 +2097,19 @@
                }
            }

            var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
            if (stocks != null && stocks.Count > 0)
            if (stock.IsFull)
            {
                foreach (var item in stocks)
                var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
                if (stocks != null && stocks.Count > 0)
                {
                    item.SpecialParameterDuration = stock.SpecialParameterDuration;
                    item.ParameterInfos = stock.ParameterInfos;
                    item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
                    foreach (var item in stocks)
                    {
                        item.SpecialParameterDuration = stock.SpecialParameterDuration;
                        item.ParameterInfos = stock.ParameterInfos;
                        item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
                    }
                    var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocks);
                }
                var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocks);
            }

            // æ·»åŠ åŽ†å²ä»»åŠ¡
@@ -2105,85 +2145,97 @@

    #region ä»»åŠ¡è¯·æ±‚方法


    private static readonly SemaphoreSlim _semaphoreUpdate = new SemaphoreSlim(1, 1);
    // æ›´æ–°ä»»åŠ¡è´§ä½

    private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
    {
        if (task == null)
        {
            return new WebResponseContent().Error("任务对象为空");
        }

        await _semaphoreUpdate.WaitAsync();
        try
        {
            // åˆ›å»ºWebResponseContent对象
            var content = new WebResponseContent();

            // èŽ·å–目标地址和更新任务状态

            input.Position = Regex.Replace(input.Position, @"-(\d+)", "");
            if (Convert.ToInt32(input.Position) > 1999)
            if (task == null)
            {
                input.Position = (Convert.ToInt32(input.Position) - 1000).ToString();
                return new WebResponseContent().Error("任务对象为空");
            }

            if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
            try
            {
                // TODO æ ¹æ®å··é“查找对应NG口，现在默认去静置堆垛机的异常口货位号
                task.CurrentAddress = input.Position;
                task.TargetAddress = "002-021-000";
                task.NextAddress = "002-021-000";
                task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                bool isResult = await BaseDal.UpdateDataAsync(task);
                return content.OK(data: task);
            }
            else if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
            {
                var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode);
                task.CurrentAddress = input.Position;
                task.TargetAddress = stockInfo.LocationInfo.LocationCode;
                task.NextAddress = stockInfo.LocationInfo.LocationCode;
                task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                bool isResult = await BaseDal.UpdateDataAsync(task);
                return content.OK(data: task);
            }
            else
            {
                var location = await GetLocationDistributeAsync(task.Roadway);
                if (location == null)
                // åˆ›å»ºWebResponseContent对象
                var content = new WebResponseContent();

                // èŽ·å–目标地址和更新任务状态

                input.Position = Regex.Replace(input.Position, @"-(\d+)", "");
                if (Convert.ToInt32(input.Position) > 1999)
                {
                    return content.Error("无法获取货位信息");
                    input.Position = (Convert.ToInt32(input.Position) - 1000).ToString();
                }

                string toAddress = location.LocationCode;
                int taskState = (int)TaskInStatusEnum.Line_InFinish;
                int beforeStatus = location.LocationStatus;
                // æ›´æ–°è´§ä½ä¿¡æ¯
                location.LocationStatus = (int)LocationEnum.Lock;

                // æ›´æ–°ä»»åŠ¡ä¿¡æ¯
                MapTaskProperties(task, input, toAddress, taskState);

                // å¼€å§‹äº‹åŠ¡
                var isResult = await UpdateTaskAsync(task, location, beforeStatus);
                if (!isResult)
                if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
                {
                    _unitOfWorkManage.RollbackTran();
                    return content.Error("更新任务失败");
                    // TODO æ ¹æ®å··é“查找对应NG口，现在默认去静置堆垛机的异常口货位号
                    task.CurrentAddress = input.Position;
                    task.TargetAddress = "002-021-000";
                    task.NextAddress = "002-021-000";
                    task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                    bool isResult = await BaseDal.UpdateDataAsync(task);
                    return content.OK(data: task);
                }
                else if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
                {
                    var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode);
                    task.CurrentAddress = input.Position;
                    task.TargetAddress = stockInfo.LocationInfo.LocationCode;
                    task.NextAddress = stockInfo.LocationInfo.LocationCode;
                    task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                    bool isResult = await BaseDal.UpdateDataAsync(task);
                    return content.OK(data: task);
                }
                else
                {
                    var location = await GetLocationDistributeAsync(task.Roadway);
                    if (location == null)
                    {
                        return content.Error("无法获取货位信息");
                    }

                // æäº¤äº‹åŠ¡
                _unitOfWorkManage.CommitTran();
                return content.OK(data: task);
                    string toAddress = location.LocationCode;
                    int taskState = (int)TaskInStatusEnum.Line_InFinish;
                    int beforeStatus = location.LocationStatus;
                    // æ›´æ–°è´§ä½ä¿¡æ¯
                    location.LocationStatus = (int)LocationEnum.Lock;

                    // æ›´æ–°ä»»åŠ¡ä¿¡æ¯
                    MapTaskProperties(task, input, toAddress, taskState);

                    // å¼€å§‹äº‹åŠ¡
                    var isResult = await UpdateTaskAsync(task, location, beforeStatus);
                    if (!isResult)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return content.Error("更新任务失败");
                    }

                    // æäº¤äº‹åŠ¡
                    _unitOfWorkManage.CommitTran();
                    return content.OK(data: task);
                }
            }
            catch (Exception ex)
            {
                // å›žæ»šäº‹åŠ¡
                _unitOfWorkManage.RollbackTran();
                // è¿™é‡Œå¯ä»¥æ·»åŠ æ—¥å¿—记录
                return new WebResponseContent().Error($"更新任务时发生错误: {ex.Message}");
            }
        }
        catch (Exception ex)
        catch (Exception)
        {
            // å›žæ»šäº‹åŠ¡
            _unitOfWorkManage.RollbackTran();
            // è¿™é‡Œå¯ä»¥æ·»åŠ æ—¥å¿—记录
            return new WebResponseContent().Error($"更新任务时发生错误: {ex.Message}");

            throw;
        }
        finally { _semaphoreUpdate.Release(); }
    }

    private void MapTaskProperties(Dt_Task task, RequestTaskDto input, string toAddress, int taskState)
@@ -2223,7 +2275,7 @@
    /// <param name="process">巷道</param>
    /// <param name="flag">标识（0-入库，1-空托盘入库，2-NG入库，3-出库）</param>
    /// <returns></returns>
    private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, List<string> process = null, int flag = 0)
    private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, List<string> process = null, int flag = 0)
    {
        WebResponseContent content = new WebResponseContent();

@@ -2251,7 +2303,8 @@
            TaskState = flag == 3 ? (int)TaskOutStatusEnum.OutNew : (int)TaskInStatusEnum.InNew,
            TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
            TaskNum = await BaseDal.GetTaskNo(),
            Creater = "Systeam"
            Creater = "Systeam",
            ProductionLine = productionLine
        };

        // å°è¯•æ·»åŠ æ–°ä»»åŠ¡
@@ -2280,6 +2333,7 @@
                    TaskState = task.TaskState.Value,
                    Id = 0,
                    TaskType = task.TaskType,
                    ProductionLine = task.ProductionLine
                };
                content.OK(data: taskDTO);
            }

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs

@@ -14,6 +14,7 @@
using WIDESEA_StorageTaskRepository;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;

namespace WIDESEA_StorageTaskServices;

@@ -39,18 +40,20 @@
                //if (task.TaskState == (int)TaskInStatusEnum.InNew)
                {
                    // åˆ›å»ºWMS任务
                    WMSTaskDTO taskDTO = new WMSTaskDTO()
                    {
                        TaskNum = task.TaskNum.Value,
                        Grade = 1,
                        PalletCode = task.PalletCode,
                        RoadWay = task.Roadway,
                        SourceAddress = task.SourceAddress,
                        TargetAddress = task.TargetAddress,
                        TaskState = task.TaskState.Value,
                        Id = 0,
                        TaskType = task.TaskType,
                    };
                    //WMSTaskDTO taskDTO = new WMSTaskDTO()
                    //{
                    //    TaskNum = task.TaskNum.Value,
                    //    Grade = 1,
                    //    PalletCode = task.PalletCode,
                    //    RoadWay = task.Roadway,
                    //    SourceAddress = task.SourceAddress,
                    //    TargetAddress = task.TargetAddress,
                    //    TaskState = task.TaskState.Value,
                    //    Id = 0,
                    //    TaskType = task.TaskType,
                    //    ProductionLine = task.ProductionLine,
                    //};
                    WMSTaskDTO taskDTO = CreateTaskDTO(task);
                    return content.OK(data: taskDTO);
                }
            }
@@ -108,6 +111,7 @@
                    TaskState = task.TaskState.Value,
                    Id = 0,
                    TaskType = task.TaskType,
                    ProductionLine = task.ProductionLine
                };
                content.OK(data: taskDTO);
            }
@@ -204,7 +208,8 @@
                    TaskState = (int)TaskInStatusEnum.Line_InFinish,
                    TaskType = (int)TaskOutboundTypeEnum.InToOut,
                    TaskNum = await BaseDal.GetTaskNo(),
                    Creater = "Systeam"
                    Creater = "Systeam",
                    ProductionLine = result.ProductionLine
                };
                return taskNG;
            }
@@ -261,7 +266,8 @@
                        TaskState = (int)TaskInStatusEnum.Line_InFinish,
                        TaskType = (int)TaskOutboundTypeEnum.InToOut,
                        TaskNum = await BaseDal.GetTaskNo(),
                        Creater = "Systeam"
                        Creater = "Systeam",
                        ProductionLine = result.ProductionLine
                    };
                    return taskNG;
                }
@@ -293,7 +299,8 @@
                TaskState = (int)TaskInStatusEnum.Line_InFinish,
                TaskType = (int)TaskOutboundTypeEnum.InToOut,
                TaskNum = await BaseDal.GetTaskNo(),
                Creater = "Systeam"
                Creater = "Systeam",
                ProductionLine = result.ProductionLine
            };
            return task;
        }
@@ -324,26 +331,33 @@

        if (locationInfo == null) throw new Exception("库位已满");

        // åˆ›å»ºä¸€ä¸ªTrayCellsStatusDto对象，并赋值
        TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
        {
            Software = "WMS",
            TrayBarcode = input.PalletCode,
            //EquipmentCode = "EQ_CWJZ01"
            EquipmentCode = input.EquiCodeMOM
        };

        // è°ƒç”¨GetTrayCellStatusAsync方法，获取整盘电芯
        WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
        // å¦‚果状态为false，则返回content
        if (!content.Status) throw new Exception(content.Message);

        // å°†content.Data转换为ResultTrayCellsStatus对象
        var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());

        if (stationManager.stationType == 6 && result.ProductionLine.IsNullOrEmpty())
        {
            ConsoleHelper.WriteErrorLine($"当前托盘无产线,联系MOM添加产线");
            throw new Exception("当前托盘无产线,联系MOM添加产线");
        }

        if (stationManager.stationType == 1)
        {
            #region
            // åˆ›å»ºä¸€ä¸ªTrayCellsStatusDto对象，并赋值
            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
            {
                Software = "WMS",
                TrayBarcode = input.PalletCode,
                //EquipmentCode = "EQ_CWJZ01"
                EquipmentCode = input.EquiCodeMOM
            };

            // è°ƒç”¨GetTrayCellStatusAsync方法，获取整盘电芯
            WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
            // å¦‚果状态为false，则返回content
            if (!content.Status) throw new Exception(content.Message);

            // æ·»åŠ ç»„盘信息
            // å°†content.Data转换为ResultTrayCellsStatus对象
            var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
            if (result.SerialNos.Count <= 0)
            {
                ConsoleHelper.WriteErrorLine(result.MOMMessage);
@@ -362,7 +376,8 @@
                    TaskState = (int)TaskInStatusEnum.Line_InFinish,
                    TaskType = (int)TaskOutboundTypeEnum.InToOut,
                    TaskNum = await BaseDal.GetTaskNo(),
                    Creater = "Systeam"
                    Creater = "Systeam",
                    ProductionLine = result.ProductionLine
                };
                return taskNG;
            }
@@ -410,7 +425,8 @@
            TaskState = (int)TaskInStatusEnum.Line_InFinish,
            TaskType = stationManager.stationType == 1 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
            TaskNum = await BaseDal.GetTaskNo(),
            Creater = "Systeam"
            Creater = "Systeam",
            ProductionLine = result.ProductionLine,
        };
        int lastStatus = locationInfo.LocationStatus;
        ConsoleHelper.WriteSuccessLine($"修改前：" + lastStatus.ToString());
@@ -544,7 +560,8 @@
                TaskState = (int)TaskOutStatusEnum.OutNew,
                TaskType = (int)TaskOutboundTypeEnum.OutTray,
                TaskNum = await BaseDal.GetTaskNo(),
                Creater = "Systeam"
                Creater = "Systeam",
                ProductionLine = stockinfo.ProductionLine,
            };

            return task;
@@ -635,7 +652,8 @@
                    TaskState = (int)TaskInStatusEnum.Line_InFinish,
                    TaskType = (int)TaskInboundTypeEnum.InTray,
                    TaskNum = await BaseDal.GetTaskNo(),
                    Creater = "Systeam"
                    Creater = "Systeam",
                    ProductionLine = result.ProductionLine,
                };
                return Epmtytask;
            }
@@ -695,7 +713,8 @@
                TaskState = (int)TaskInStatusEnum.Line_InFinish,
                TaskType = (int)TaskInboundTypeEnum.Inbound,
                TaskNum = await BaseDal.GetTaskNo(),
                Creater = "Systeam"
                Creater = "Systeam",
                ProductionLine = result.ProductionLine,
            };

            var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -859,7 +878,7 @@

                var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();

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

                if (stockInfo != null)
                {
@@ -895,6 +914,43 @@
        return content;
    }

    /// <summary>
    /// æŸ¥è¯¢ç©ºç›˜åº“存信息
    /// </summary>
    private async Task<DtStockInfo> QueryStockInfoForEmptyTrayFRAsync(string areaCode, string position, string productLine)
    {
        var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);

        ConsoleHelper.WriteColorLine(position + "..." + areaCode, ConsoleColor.Magenta);
        var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == position && x.stationType == 17);

        ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
        var stackers = station.Roadway.Split(',').ToList();


        var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
            .Where(x => x.DeviceStatus == "1")
            .Where(x => stackers.Contains(x.DeviceCode))
            .ToList();

        var deviceCode = devices.Select(x => x.DeviceCode).ToList();

        var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
            .Includes(x => x.LocationInfo) // é¢„加载LocationInfo
            .Includes(x => x.StockInfoDetails) // é¢„加载StockInfoDetails
            .Where(x => x.ProductionLine == productLine)
            .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 && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // è¿‡æ»¤æ¡ä»¶
            .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
            .OrderBy(x => x.CreateDate) // æŽ’序
            .FirstAsync(); // è½¬æ¢ä¸ºåˆ—表

        //var firstOrDefault = result[0]; // æŸ¥æ‰¾ç¬¬ä¸€ä¸ªåŒ¹é…çš„元素
        //return firstOrDefault;
        return result;
    }

    #endregion

    public async Task<WebResponseContent> RequestOutTaskToBZAsync(RequestTaskDto json)
@@ -905,6 +961,7 @@
            Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call");

            var stockInfo = _stockInfoRepository.Db.Queryable<DtStockInfo>()
                    .Where(x => x.ProductionLine == station.productLine)
                    .Includes(x => x.LocationInfo) // é¢„加载LocationInfo
                    .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true) // è¿‡æ»¤æ¡ä»¶
                    .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock) // è¿‡æ»¤æ¡ä»¶
@@ -934,7 +991,8 @@
                TaskState = (int)TaskOutStatusEnum.OutNew,
                TaskType = (int)TaskOutboundTypeEnum.Outbound,
                TaskNum = await BaseDal.GetTaskNo(),
                Creater = "Systeam"
                Creater = "Systeam",
                ProductionLine = stockInfo.ProductionLine,
            };

            WMSTaskDTO taskDTO = CreateTaskDTO(task);

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs

@@ -61,7 +61,7 @@
            var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
            var strings = config.ConfigValue.Split(',').ToList();
            // å…¥åº“送至常温3
            var resultContent = await CreateNewTask(input, strings);
            var resultContent = await CreateNewTask(input, input.ProductionLine, strings);
            if (resultContent.Status)
            {
                await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -75,14 +75,14 @@
        {
            // é€è‡³åŒ…装
            List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
            return await CreateNewTask(input, strings, 3);
            return await CreateNewTask(input, input.ProductionLine, strings, 3);
        }
        else
        {
            var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
            var strings = config.ConfigValue.Split(',').ToList();
            // å…¥åº“送至常温3
            var resultContent = await CreateNewTask(input, strings);
            var resultContent = await CreateNewTask(input, input.ProductionLine, strings);
            if (resultContent.Status)
            {
                await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -138,7 +138,7 @@
        }
        List<string> strings = stationManagers.Roadway.Split(',').ToList();

        var resultContent = await CreateNewTask(input, strings);
        var resultContent = await CreateNewTask(input, result.ProductionLine, strings);
        if (resultContent.Status)
        {
            var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -200,7 +200,7 @@
        //    NGStation = stationManagers.stationNGChildCode.Split(',').ToList();
        //}
        List<string> NGStation = stationManagers.stationNGChildCode.Split(',').ToList();
        content = await CreateNewTask(input, NGStation, 2);
        content = await CreateNewTask(input, input.ProductionLine, NGStation, 2);
        return content.Error("存在异常电芯");
    }

@@ -230,7 +230,8 @@
            TargetAddress = task.Roadway,
            TaskState = task.TaskState.Value,
            Id = 0,
            TaskType = task.TaskType
            TaskType = task.TaskType,
            ProductionLine = task.ProductionLine,
        };
        return new WebResponseContent().OK(data: taskDTO);
    }

 ÏîÄ¿×ÊÁÏ/½Ó¿ÚЭÒé/¹ÚÓîMOMÏîÄ¿·½°¸Éè¼Æ¹æ¸ñÊé_µçо¶Î_[´´ÖǾ²Ö󻯹¤Ðò]_É豸¼¯³ÉÄ£¿é_v1.2@20250208(1).pdf

Binary files differ