合并

wanshenmean

2025-03-23 6cc88ff41d879065dc0752c8af566002baf0a5c2

合并

 .gitignore

@@ -55167,3 +55167,4 @@
/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/publish/runtimes/linux-arm/native/libe_sqlite3.so
/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/publish/runtimes/linux-arm/native/libSkiaSharp.so
/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/publish/runtimes/linux-arm/native/libSystem.IO.Ports.Native.so
/项目资料/项目图纸/前段线体点位图/08三楼输送布局点位图1107.dwl2

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs

@@ -463,7 +463,7 @@
        /// <param name="command">读取的请求信息</param>
        /// <param name="childDeviceCode">子设备编号</param>
        /// <param name="index">线体当前bool读取偏移地址</param>
        public async void EmptyTrayReturn(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode, int index, WIDESEAWCS_Model.Models.Platform platform)
        public async void EmptyTrayReturn(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode, int index, Platform platform)
        {
            try
            {

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs

@@ -1,4 +1,5 @@
using Masuit.Tools;
using Masuit.Tools.Systems;
using Newtonsoft.Json;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
@@ -220,6 +221,7 @@
        {
            if (command.ConveyorLineBarcode != "NoRead")
            {
                #region
                //var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                //var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.MOMIP_BASE)?.ConfigValue;
                //var ipAddress = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.TrayCellsStatus)?.ConfigValue;
@@ -264,9 +266,18 @@
                //                    if (device != null)
                //                    {
                //                        CommonConveyorLine_After CommonConveyorLine_After = (CommonConveyorLine_After)device;
                //                        ConveyorLineTaskCommand_After conveyorLineAfter = CommonConveyorLine_After.ReadCustomer<ConveyorLineTaskCommand_After>((Convert.ToInt32(station.stationChildCode)).ToString());

                //                        ConveyorLineTaskCommand_After taskCommand = new ConveyorLineTaskCommand_After()
                //                        {
                //                            ConveyorLineTaskNum = Convert.ToInt32(1),
                //                            ConveyorLineTargetAddress = Convert.ToInt16(2234),
                //                            ConveyorLineBarcode = command.ConveyorLineBarcode.ToString(),
                //                        };
                //                        CommonConveyorLine_After.SendCommand(taskCommand, station.stationChildCode);
                //                        CommonConveyorLine_After.SetValue(ConveyorLineDBName_After.ResponState, 1, station.stationChildCode);
                //                    }
                //                    //发送到分容
                //                    return;
                //                }
                //            }
                //        }
@@ -284,9 +295,10 @@
                //                if (device != null)
                //                {
                //                    CommonConveyorLine_After CommonConveyorLine_After = (CommonConveyorLine_After)device;
                //                    ConveyorLineTaskCommand_After conveyorLineAfter = CommonConveyorLine_After.ReadCustomer<ConveyorLineTaskCommand_After>((Convert.ToInt32(station.stationChildCode)).ToString());
                //                    if (conveyorLineAfter.HasPallet == 0)
                //                    ConveyorLineTaskCommand_After conveyorLineAfter = CommonConveyorLine_After.ReadCustomer<ConveyorLineTaskCommand_After>(Convert.ToInt32(station.stationChildCode).ToString());
                //                    if (conveyorLineAfter.InteractiveSignal == 16)
                //                    {
                //                        var TaskNum = SnowFlake.LongId;
                //                        Dt_Task task = new Dt_Task()
                //                        {
                //                            TaskNum = _taskRepository.GetTaskNo().Result,
@@ -295,7 +307,7 @@
                //                            Roadway = station.Roadway,
                //                            SourceAddress = childDeviceCode,
                //                            TargetAddress = station.stationChildCode,
                //                            CurrentAddress = station.stationChildCode,
                //                            CurrentAddress = childDeviceCode,
                //                            NextAddress = station.stationChildCode,
                //                            TaskState = (int)TaskInStatusEnum.InNew,
                //                            ExceptionMessage = "",
@@ -340,7 +352,7 @@
                //{
                //    ConsoleHelper.WriteErrorLine(result1.MOMMessage);
                //}

                #endregion

                if (_taskRepository.QueryFirst(x => x.PalletCode == command.ConveyorLineBarcode) != null)
                {
@@ -360,7 +372,7 @@
                    {
                        var taskCommand = MapTaskCommand(task, command);
                        conveyorLine.SendCommand(taskCommand, childDeviceCode);
                        //conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
                        conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
                        _taskService.UpdateTaskStatusToNext(task);
                    }
                }