代码提交

wankeda

2025-04-25 b3afd18d58cc94bb94b8a91030d1b2fa89f637e6

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -17,6 +17,7 @@

#endregion << ç‰ˆ æœ¬ æ³¨ é‡Š >>

using System.Threading.Tasks;
using AutoMapper;
using Quartz;
using WIDESEAWCS_Common.TaskEnum;
@@ -40,8 +41,9 @@
        private readonly ITaskExecuteDetailService _taskExecuteDetailService;
        private readonly IRouterService _routerService;
        private readonly IMapper _mapper;
        private readonly ITaskCZDetailsRepository _detailsRepository;

        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, ITaskCZRepository taskCZRepository)
        public CommonConveyorLineJob(ITaskService taskService, ITaskCZDetailsRepository detailsRepository, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, ITaskCZRepository taskCZRepository)
        {
            _taskService = taskService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -49,12 +51,11 @@
            _mapper = mapper;
            _taskRepository = taskRepository;
            _taskCZRepository = taskCZRepository;
            _detailsRepository = detailsRepository;
        }

        public Task Execute(IJobExecutionContext context)
        
        
        

        {
            try
            {
@@ -68,8 +69,8 @@
                // å®šä¹‰çº¿ä½“实盘入库请求的地址和任务类型
                var requests = new Dictionary<string, string>
                {
                    { "DB1002.1093.0", "ZJXL-WLX002" },
                    { "DB1002.1493.0", "FJXL-WLX002" }
                    { "DB1002.1493.0", "ZJXL-WLX002" },
                    { "DB1002.1093.0", "FJXL-WLX002" }
                };

                // å®šä¹‰çº¿ä½“空盘回流请求的地址和任务类型
@@ -115,7 +116,7 @@
                string taskType = request.Value.Contains("ZJXL") ? "正极" : "负极";

                // æŸ¥è¯¢æ˜¯å¦å­˜åœ¨å·²ç”Ÿæˆçš„新任务
                var task = _taskRepository.QueryFirst(x => x.SourceAddress == fromAdd && x.TaskState == (int)TaskInStatusEnum.InNew);
                var task = _taskRepository.QueryFirst(x => x.SourceAddress == fromAdd);//&& x.TaskState == (int)TaskInStatusEnum.InNew
                if (task != null)
                {
                    ConsoleHelper.WriteInfoLine($"{nameof(CommonConveyorLineJob)}: {taskType}{requestType},任务已生成存在，稍后重试......");
@@ -123,7 +124,7 @@
                }

                // æŸ¥è¯¢ä»»åŠ¡ç±»åž‹å¯¹åº”çš„czTask
                DtCZTask czTask = _taskCZRepository.QueryFirst(x => x.TaskType == taskType);
                DtCZTask czTask = _taskCZRepository.QueryFirst(x => x.TaskType == taskType && (x.TaskStatus == TaskInStatusEnum.InFinish.ToString() || x.TaskStatus == TaskInStatusEnum.Line_InExecuting.ToString()));
                if (czTask == null)
                {
                    ConsoleHelper.WriteInfoLine($"{nameof(CommonConveyorLineJob)}: {taskType}{requestType},{taskType}任务不存在，稍后重试......");
@@ -131,7 +132,7 @@
                }

                // åˆ›å»ºå¹¶æ·»åŠ æ–°ä»»åŠ¡åˆ°ä»»åŠ¡ä»“库
                task = CreateTask(fromAdd, czTask.TaskEndAddress, czTask.TaskOrderNo, czTask.TaskProductCode, taskType);
                task = CreateTask(fromAdd, czTask.TaskEndAddress, czTask.TaskOrderNo, czTask.TaskProductCode, taskType, czTask.Id);
                _taskRepository.AddData(task);
                ConsoleHelper.WriteInfoLine($"{nameof(CommonConveyorLineJob)}: {taskType}{requestType},任务已生成，等待执行......");
            }
@@ -148,7 +149,7 @@
                }

                string fromAdd = request.Value;
                string taskType = request.Value.Contains("ZJXL") ? "正极" : "负极";
                string taskType = "负极"; //request.Value.Contains("ZJXL") ? "正极" :

                // æ ¹æ®ä»»åŠ¡ç±»åž‹ç¡®å®šè¯·æ±‚地址
                (string upRequest, string gmRequest, string gmState) = GetRequestAddresses(taskType);
@@ -191,8 +192,35 @@
        }

        // è¾…助方法：创建任务对象
        private Dt_Task CreateTask(string currentAddress, string targetAddress, string remark, string palletCode, string taskType)
        private Dt_Task CreateTask(string currentAddress, string targetAddress, string remark, string palletCode, string taskType, int czTaskID = 0)
        {
            if (targetAddress != "WaitBind")
            {
                var details = _detailsRepository.QueryData(x => x.TaskEndAddress == targetAddress).ToList();
                foreach (var item in details)
                {
                    var taskCZ = _taskCZRepository.QueryFirst(x => x.TaskTaskID == item.TaskTaskID);
                    if (taskCZ.TaskType.Contains("正极"))
                    {
                        taskCZ.TaskZJFinishNumber += 1;
                    }
                    else
                    {
                        taskCZ.TaskFJFinishNumber += 1;
                    }
                    if (taskCZ.TaskZJFinishNumber == taskCZ.TaskNumber || taskCZ.TaskFJFinishNumber == taskCZ.TaskNumber)
                    {
                        _taskCZRepository.DeleteData(taskCZ);
                    }

                    var isTrue = _taskCZRepository.UpdateData(taskCZ);
                }
            }
            Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.SourceAddress == currentAddress);
            if (dt_Task != null)
            {
                return null;
            }
            return new Dt_Task
            {
                TaskNum = _taskService.GetTaskNum(),
@@ -208,7 +236,7 @@
                NextAddress = targetAddress,
                Barcode = "",
                Roadway = $"{taskType}AGV",
                WMSId = 0,
                WMSId = czTaskID > 0 ? czTaskID : 0,
                Remark = remark
            };
        }