'测试'

Admin

2026-01-19 4b403ca5072dc74fbebf36f816df7d0c92241a91

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WMSCruJob.cs

@@ -63,6 +63,9 @@
            _timer = new Timer(DoWorkWheel, null, TimeSpan.Zero, TimeSpan.FromSeconds(3));
            return Task.CompletedTask;
        }

        public static List<string> InStationareaList = new List<string>() { "1113", "1114", "1115", "1116", "1117", "1118", "1119", "1120", "1121", "1122" };

        private void DoWorkWheel(object state)
        {
            if (!Monitor.TryEnter(_taskProcessLock, TASK_PROCESS_TIMEOUT))
@@ -74,6 +77,7 @@
            {
                // å®šä¹‰çŠ¶æ€å¸¸é‡ï¼Œé¿å…é­”法数字
                const int PLC_IN_FINISH = (int)InTaskStatusEnum.PLC_InFinish;
                const int PLC_IN_InNew = (int)InTaskStatusEnum.InNew;
                const int OUT_NEW = (int)OutTaskStatusEnum.OutNew;
                const int SC_OUT_FINISH = (int)OutTaskStatusEnum.SC_OutFinish;
                const int SC_IN_EXECUTING = (int)InTaskStatusEnum.SC_IntExecuting;
@@ -96,13 +100,15 @@
                    .Where(x =>
                        (x.TaskStatus == PLC_IN_FINISH ||
                         x.TaskStatus == OUT_NEW ||
                         x.TaskStatus == SC_OUT_FINISH) &&
                         x.TaskStatus == SC_OUT_FINISH || (x.TaskStatus == PLC_IN_InNew && InStationareaList.Contains(x.SourceAddress))) &&
                        !excludedRoadways.Contains(x.Roadway))
                    .ToList();

                // æŒ‰çŠ¶æ€åˆ†ç»„处理，减少重复查询
                ProcessInAndNewTasks(tasksToProcess, allTasks, excludedRoadways);   //下发堆垛机
                ProcessOutFinishTasks(tasksToProcess, allTasks);    //下发输送线任务
                ProcessInPalltask(tasksToProcess, allTasks);

            }
            catch (Exception ex)
            {
@@ -129,7 +135,8 @@
            var inAndNewTasks = tasksToProcess
                .Where(x => x.TaskStatus == PLC_IN_FINISH || x.TaskStatus == OUT_NEW).OrderBy(x=>x.CreateDate)
                .ToList();

            if(inAndNewTasks.Count > 0)
            {
            foreach (var task in inAndNewTasks)
            {
                // æ£€æŸ¥åŒä¸€å··é“是否有正在执行的任务
@@ -154,6 +161,7 @@
                WebResponseContent webResponse=JudgmentIsRelocations(task);
                if (!webResponse.Status) continue;


                // ä¸‹å‘堆垛机任务
                WCSginseng result = _taskService.SC_IssueTasks(
                    task.TaskId,
@@ -170,6 +178,9 @@
            }
        }

            
        }

        private void ProcessOutFinishTasks(List<Dt_Task> tasksToProcess, List<Dt_Task> allTasks)
        {
            const int SC_OUT_FINISH = (int)OutTaskStatusEnum.SC_OutFinish;
@@ -178,7 +189,8 @@
            var outFinishTasks = tasksToProcess
                .Where(x => x.TaskStatus == SC_OUT_FINISH)
                .ToList();

            if(outFinishTasks.Count > 0)
            {
            foreach (var task in outFinishTasks)
            {
                // æ£€æŸ¥åŒä¸€å··é“是否有其他已完成的任务
@@ -205,6 +217,36 @@
            }
        }

            
        }

        private void ProcessInPalltask(List<Dt_Task> tasksToProcess, List<Dt_Task> allTasks)
        {
            const int PLC_IN_InNew = (int)InTaskStatusEnum.InNew;
            const int PLC_PLC_INEXECUTING = (int)InTaskStatusEnum.PLC_InExecuting;
            var outFinishTasks = tasksToProcess
                .Where(x => x.TaskStatus == PLC_IN_InNew && InStationareaList.Contains(x.SourceAddress))
                .ToList();
            if(outFinishTasks.Count > 0)
            {
                foreach (var task in outFinishTasks)
                {
                    // ä¸‹å‘PLC任务
                    WCSginseng result = _taskService.PLC_IssueTasks(
                        task.TaskId,
                        int.Parse(task.Roadway),
                        task.TaskNum,
                        task.PalletCode,
                        int.Parse(task.PalletType),
                        task.CurrentAddress,
                        task.NextAddress,
                        "");

                    UpdateTaskStatus(task, result, PLC_PLC_INEXECUTING, 2);
                }
            }
        }

        private void UpdateTaskStatus(Dt_Task task, WCSginseng result, int successStatus,int statype)
        {
            if (result.IsSuccess)
@@ -216,6 +258,11 @@
                    string Result = MesOutTaskStatusEnum.出库开始.GetDescription();
                    //调取上游系统反馈开始任务
                    _taskService.OutStoreDocCallback(task.TaskNum,Result, "操作成功");
                }else if(task.TaskStatus == (int)InTaskStatusEnum.PLC_InExecuting)
                {
                    string Result = MesInTaskStatusEnum.入库开始.GetDescription();
                    //调取上游系统反馈开始任务
                    _taskService.InStoreDocCallback(task.TaskNum, Result, "操作成功",task.PalletCode,"");
                }
            }
            else