字段名称修正

刘磊

2025-06-18 40a36a347f78b8cbcad6f9abf54c4459ea9960f9

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

@@ -1,4 +1,5 @@
#region MyRegion

#region << 版 本 注 释 >>

/*----------------------------------------------------------------
@@ -20,27 +21,28 @@

using AutoMapper;
using HslCommunication;
using Microsoft.AspNetCore.Server.HttpSys;
using Newtonsoft.Json;
using Quartz;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core.HttpContextUser;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_SignalR;
using WIDESEAWCS_Tasks.ConveyorLineJob;
using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;

namespace WIDESEAWCS_Tasks
{
@@ -53,8 +55,14 @@
        private readonly IRouterService _routerService;
        private readonly IMapper _mapper;
        private readonly IDt_StationManagerService _stationManagerService;
        private readonly ISys_ConfigService _sys_ConfigService;
        private readonly ICacheService _cacheService;
        private readonly INoticeService _noticeService;
        private readonly IDt_needBarcodeRepository _needBarcodeRepository;
        private static List<string>? userTokenIds;
        private static List<int>? userIds;

        public CommonConveyorLine_AfterJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IDt_StationManagerService stationManagerService)
        public CommonConveyorLine_AfterJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IDt_StationManagerService stationManagerService, ISys_ConfigService sys_ConfigService, ICacheService cacheService, INoticeService noticeService, IDt_needBarcodeRepository needBarcodeRepository)
        {
            _taskService = taskService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -62,9 +70,13 @@
            _mapper = mapper;
            _taskRepository = taskRepository;
            _stationManagerService = stationManagerService;
            _sys_ConfigService = sys_ConfigService;
            _cacheService = cacheService;
            _noticeService = noticeService;
            _needBarcodeRepository = needBarcodeRepository;
        }

        public Task Execute(IJobExecutionContext context)
        public async Task Execute(IJobExecutionContext context)
        {
            try
            {
@@ -85,9 +97,34 @@
                                method.Invoke(this, new object[] { conveyorLine, command, station });
                            }
                        }
                        if (station.stationType == 6 && station.stationArea == "3")
                        {
                            await GetEmptyTrayAsync(station, conveyorLine, command);
                        }

                        #region 调用事件总线通知前端

                        var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
                        if (tokenInfos == null || !tokenInfos.Any())
                        {
                            //throw new Exception(conveyorLine.DeviceName + "缓存中未找到Token缓存");
                            continue;
                        }
                        var userTokenIds = tokenInfos?.Select(x => x.Token_ID).ToList();
                        var userIds = tokenInfos?.Select(x => x.UserId).ToList();

                        object obj = new
                        {
                            childDeviceCode = station.stationChildCode,
                            commandAfter = command,
                        };
                        _noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });

                        #endregion 调用事件总线通知前端
                    }

                    #region 路由方式

                    //List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
                    //foreach (string childDeviceCode in childDeviceCodes)
                    //{
@@ -104,8 +141,9 @@
                    //            method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode });
                    //        }
                    //    }
                    //} 
                    #endregion
                    //}

                    #endregion 路由方式
                }
            }
            catch (Exception ex)
@@ -117,7 +155,7 @@
                //WriteDebug("CommonConveyorLineJob", "test");
                //Console.Out.WriteLine(DateTime.Now);
            }
            return Task.CompletedTask;
            return;
        }

        /// <summary>
@@ -128,6 +166,13 @@
        /// <param name="childDeviceCode">子设备编号</param>
        public void RequestInbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, Dt_StationManager stationInfo)
        {
            var log = $"【{conveyorLine.DeviceName}】,托盘号：【{command.ConveyorLineBarcode}】,站台：【{stationInfo.remark}】请求任务";
            ConsoleHelper.WriteSuccessLine(log);

            _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
            WriteInfo(conveyorLine.DeviceName, log);
            //if()

            var taskNew = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
            if (taskNew == null)
            {
@@ -136,14 +181,45 @@
                    Dt_Task task = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
                    if (task != null)
                    {
                        //ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
                        //taskCommand.InteractiveSignal = command.InteractiveSignal;
                        //taskCommand.ResponState = 1;
                        //taskCommand.ConveyorLineTaskNum = task.TaskNum;
                        //taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress);
                        conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, stationInfo.stationChildCode);
                        //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, 1, task.NextAddress);
                        //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);

                        var needBarcode = _needBarcodeRepository.QueryFirst(x => x.toArea == stationInfo.stationChildCode);
                        if (needBarcode != null)
                        {
                            needBarcode.inLineNum -= 1;
                            _needBarcodeRepository.UpdateData(needBarcode);
                        }
                    }
                }
                else   //如果任务请求失败
                {
                    //如果请求位置与NG位置一致 则写当前位置让线体退回
                    if (stationInfo.stationChildCode == stationInfo.stationNGChildCode)
                    {
                        conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 2, stationInfo.stationChildCode);
                    }
                }
            }
        }

        /// <summary>
        /// 输送线请求空框
        /// </summary>
        /// <param name="conveyorLine"></param>
        /// <param name="command"></param>
        /// <param name="stationInfo"></param>
        public void RequestEmptyOutbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, Dt_StationManager stationInfo)
        {
            if (stationInfo.stationType != 7) return;
            var taskNew = _taskRepository.QueryFirst(x => x.Roadway == stationInfo.Roadway && x.TaskType == (int)TaskOutboundTypeEnum.OutTray);
            if (taskNew == null)   //不存在空框出库任务 则请求WMS出空库
            {
                ConsoleHelper.WriteWarningLine("请求空托盘");
                if (_taskService.RequestTask(command.ConveyorLineBarcode, stationInfo).Result.Status)
                {
                    Dt_Task task = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
                    if (task != null)
                    {
                    }
                }
            }
@@ -186,6 +262,50 @@
        //    }
        //}

        private async Task GetEmptyTrayAsync(Dt_StationManager stationManager, CommonConveyorLine_After commonConveyor, ConveyorLineTaskCommand_After conveyorLine)
        {
            ConveyorLineTaskCommand_After command = commonConveyor.ReadCustomer<ConveyorLineTaskCommand_After>((Convert.ToInt32(stationManager.stationChildCode) + 2).ToString());
            if (conveyorLine.HasPallet == 0 || command.HasPallet == 0)
            {
                var needBarcode = _needBarcodeRepository.QueryFirst(x => x.toArea == stationManager.stationChildCode);

                if (needBarcode.inLineNum < needBarcode.cacheNum)
                {
                    var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                    var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
                    var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.GetFROutTrayToCW)?.ConfigValue;
                    if (wmsBase == null || requestTask == null)
                    {
                        throw new InvalidOperationException("WMS IP 未配置");
                    }
                    var wmsIpAddrss = wmsBase + requestTask;

                    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)
                    {
                        //ConsoleHelper.WriteErrorLine($"分容呼叫空托盘失败{content.Message}");
                        return;
                    }
                    WMSTaskDTO wMSTaskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

                    ConsoleHelper.WriteSuccessLine(content.Data.ToString());
                    List<WMSTaskDTO> wMSTaskDTOs = new List<WMSTaskDTO>() { wMSTaskDTO };
                    _taskService.ReceiveWMSTask(wMSTaskDTOs);
                    needBarcode.inLineNum += 1;
                    _needBarcodeRepository.UpdateData(needBarcode);
                }
                else
                {
                    ConsoleHelper.WriteErrorLine($"分容空托盘入口【{stationManager.stationChildCode}】在途数量>缓存数量");
                }
            }
            else
            {
                ConsoleHelper.WriteErrorLine($"分容空托盘入口【{stationManager.stationChildCode}】有盘");
            }
        }
    }
}

#endregion