dengjunjie
2025-04-26 18d2f40bbf40469b033de6f07ca8a8e3bc191132
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs
@@ -26,6 +26,8 @@
        public List<Task> ConveyorLineExtend(CommonConveyorLine conveyorLine)
        {
            List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
            List<string> strings = new List<string>() { "1003", "1006", "1007" };
            childDeviceCodes.AddRange(strings);
            List<Task> tasks = new List<Task>();
            foreach (string childDeviceCode in childDeviceCodes)
            {
@@ -48,7 +50,7 @@
                            Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
                            if (task != null)
                            {
                                List<Dt_Router> routers = _routerRepository.QueryData(x => x.StartPosi == task.NextAddress && x.ChildPosiDeviceCode == "AGV" && x.Remark == "未占用");
                                List<Dt_Router> routers = _routerRepository.QueryData(x => x.StartPosi == task.TargetAddress && x.ChildPosiDeviceCode == "AGV" && x.Remark == "未占用");
                                if (routers != null && routers.Count > 0)
                                {
                                    var router = routers.FirstOrDefault();
@@ -57,6 +59,7 @@
                                        task.TaskState = TaskOutStatusEnum.Line_OutFinish.ObjToInt();
                                        task.CurrentAddress = childDeviceCode;
                                        task.NextAddress = router.NextPosi;
                                        task.TargetAddress = task.NextAddress;
                                        router.Remark = "占用";
                                        _routerRepository.UpdateData(router);
                                        _taskService.UpdateData(task);
@@ -143,6 +146,15 @@
                //    //}
                //}
            }
            else
            {
                Dt_Task _Task = new Dt_Task();
                _Task.TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss"));
                _Task.CurrentAddress = childDeviceCode;
                _Task.NextAddress = "1001";
                ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(_Task);
                taskCommand.WriterTrue = (short)command.inRead;
            }
        }
        /// <summary>