同步

刘磊

22 小时以前 373c52bea19dd631687453b4d6cb711ccf55b73a

同步

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs

@@ -21,5 +21,10 @@
            return BaseDal.QueryFirst(x => x.stationChildCode == ChildCode && x.stationArea == area && x.stationStatus == "1");
        }

        public List<Dt_StationManager> GetStationInfoByOCV(string ChildCode, int stationType)
        {
            return BaseDal.QueryData(x => x.stationChildCode == ChildCode && x.stationType == stationType && x.stationStatus == "1").ToList();
        }

    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs

@@ -39,5 +39,13 @@
        /// <param name="area"></param>
        /// <returns></returns>
        Dt_StationManager GetStationInfoByChildCode(string ChildCode, string area);

        /// <summary>
        /// 根据子设备编号和站台类型 获取启用的站台
        /// </summary>
        /// <param name="ChildCode">设备PLC编号</param>
        /// <param name="sttionType">站台类型</param>
        /// <returns></returns>
        List<Dt_StationManager> GetStationInfoByOCV(string ChildCode, int sttionType);
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_CW/CommonConveyorLine_CWJob.cs

@@ -118,8 +118,8 @@
                    #region 路由方式

                    List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
                    DateTime dateTime = DateTime.Now;
                    Console.WriteLine($"循环开始时间{dateTime}");
                    //DateTime dateTime = DateTime.Now;
                    //Console.WriteLine($"循环开始时间{dateTime}");
                    foreach (string childDeviceCode in childDeviceCodes)
                    {
                        //Thread.Sleep(1000);
@@ -188,7 +188,7 @@

                    }
                    DateTime ENDdateTime = DateTime.Now;
                    Console.WriteLine($"循环结束时间{ENDdateTime}");
                    //Console.WriteLine($"循环结束时间{ENDdateTime}");

                    #endregion 路由方式
                }

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs

@@ -52,7 +52,7 @@

namespace WIDESEAWCS_Tasks
{
    //[DisallowConcurrentExecution]
    [DisallowConcurrentExecution]
    public partial class CommonConveyorLine_GWJob : JobBase, IJob
    {
        public readonly ITaskService _taskService;
@@ -69,7 +69,7 @@
        private readonly IDeviceInfoRepository _deviceInfoRepository;
        private static List<string>? userTokenIds;
        private static List<int>? userIds;
        private static List<string> childCodeList = new List<string>();
        //private static List<string> childCodeList = new List<string>();

        public CommonConveyorLine_GWJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService, IDt_needBarcodeRepository needBarcodeRepository, IDeviceInfoRepository deviceInfoRepository)
        {
@@ -118,19 +118,22 @@
                    #region 路由方式

                    List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
                    //DateTime dateTime = DateTime.Now;
                    //Console.WriteLine($"循环开始时间{dateTime}");
                    foreach (string childDeviceCode in childDeviceCodes)
                    {
                        if (childCodeList.Contains(childDeviceCode))
                        {
                            continue;
                        }
                        childCodeList.Add(childDeviceCode);

                        lock (this)
                        {
                        //Thread.Sleep(1000);
                        //if (childCodeList.Contains(childDeviceCode))
                        //{
                        //    Console.WriteLine($"当前{childDeviceCode}执行中，已跳过");
                        //    continue;
                        //}
                        //childCodeList.Add(childDeviceCode);
                        //Console.WriteLine(childDeviceCode);
                            ConveyorLineTaskCommand_After command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(childDeviceCode);

                            if (command == null) continue;
                        //if (command.InteractiveSignal == 0 && command.HasPallet != 1) continue;
                            if (command.ConveyorLineBarcode.Trim().Contains("\0")) command.ConveyorLineBarcode = "";

                            DeviceProtocolDetailDTO? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(ConveyorLineTaskCommand_After.InteractiveSignal) && x.ProtocalDetailValue == command.InteractiveSignal.ToString());
@@ -143,23 +146,26 @@
                                }
                            }

                            if (childDeviceCode == "1670" || childDeviceCode == "1666" || childDeviceCode == "1548" || childDeviceCode == "1448")
                            {
                                Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
                                if (platform != null)
                                {
                                    if (command.HasPallet != 1)
                                    {
                                        MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);
                                        if (method != null)
                                        {
                                            //var strings = platform.Location.Split(',').ToList();
                                            int count = 1;
                                            method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
                                        }
                                    }
                                }
                            }
                        //if (childDeviceCode == "1670" || childDeviceCode == "1666" || childDeviceCode == "1548" || childDeviceCode == "1448")
                        //{
                        //    Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
                        //    if (platform != null)
                        //    {
                        //        if (command.HasPallet != 1)
                        //        {
                        //            MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);
                        //            if (method != null)
                        //            {
                        //                //var strings = platform.Location.Split(',').ToList();
                        //                int count = 1;
                        //                method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
                        //            }
                        //        }
                        //    }
                        //}

                        //childCodeList.Remove(childDeviceCode);

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

                            var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
@@ -180,9 +186,9 @@

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

                            childCodeList.Remove(childDeviceCode);
                        }
                    }
                    //DateTime ENDdateTime = DateTime.Now;
                    //Console.WriteLine($"循环结束时间{ENDdateTime}");

                    #endregion 路由方式
                }
@@ -214,7 +220,7 @@
                var log = $"时间：【{DateTime.Now}】【{conveyorLine.DeviceName}】托盘号：【{command.ConveyorLineBarcode}】任务号：【{command.ConveyorLineTaskNum}】设备编码：【{childDeviceCode}】";
                ConsoleHelper.WriteSuccessLine(log);

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

                if (task == null)
@@ -223,12 +229,16 @@
                }
                else
                {
                    if (childDeviceCode == "1039")
                    {
                    var GWTask = _taskRepository.QueryData(x => x.Roadway.Contains("GWSC2") && x.SourceAddress == "1039" && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskInStatusEnum.Line_InFinish)).ToList();
                    if (GWTask.Count >= 2 && childDeviceCode == "1039" && task.Roadway.Contains("GWSC2"))
                    {
                        ConsoleHelper.WriteErrorLine($"时间：【{DateTime.Now}】托盘号：【{command.ConveyorLineBarcode}】高温二已存在【{GWTask.Count}】个任务大于2个任务不可下发");
                        return;
                    }
                    }

                    ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);

                    bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
@@ -419,7 +429,7 @@
            var log = $"时间：【{DateTime.Now}】【{conveyorLine.DeviceName}】托盘号：【{command.ConveyorLineBarcode}】任务号：【{command.ConveyorLineTaskNum}】设备编码：【{childDeviceCode}】";
            ConsoleHelper.WriteSuccessLine(log);

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



 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs

@@ -321,12 +321,16 @@
                    var task = _taskService.QueryBarCodeConveyorLineTask(command.ConveyorLineBarcode, childDeviceCode);
                    if (task != null)
                    {
                        if (childDeviceCode == "1039")
                        {
                        var GWTask = _taskRepository.QueryData(x => x.Roadway.Contains("GWSC2") && x.SourceAddress == "1039" && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskInStatusEnum.Line_InFinish)).ToList();
                        if (GWTask.Count >= 2 && childDeviceCode == "1039" && task.Roadway.Contains("GWSC2"))
                        {
                            ConsoleHelper.WriteErrorLine($"托盘号：【{command.ConveyorLineBarcode}】高温二已存在【{GWTask.Count}】个任务大于2个任务不可下发");
                            return;
                        }
                        }

                        ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
                        //conveyorLine.SendCommand(taskCommand, childDeviceCode);


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

@@ -86,8 +86,8 @@
        {
            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
            {
                if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                {
                //if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                //{
                    if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB")
                    {
                        var agingOutputDto = MapToAgingOutputDto(stock);
@@ -109,7 +109,7 @@
                            return content.Error("MOM通报点芯NG");
                        }
                    }
                }
                //}
            }

            if (task.Remark == "NG")
@@ -930,7 +930,8 @@
                }).ToList()
            };
        }
        else { 
        else
        {
            _boxingInfoRepository.DeleteData(boxing);
            return new DtBoxingInfo
            {