反馈MES工单完成

huanghongfeng

2024-07-19 bb929bd0809eefc1108dd779846ff07d997f7ef0

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs

@@ -44,101 +44,12 @@
                {
                    var agvtask = agvtasks.Where(x => x.agv_tasktype == AGVTaskType).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).FirstOrDefault();
                    if (agvtask != null) UpdateQueue(agvtaskService, agvtask);
                    //var tasks = agvtasks.Where(x => x.agv_tasktype == AGVTaskType).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).ToList();
                    //foreach (var task in tasks)
                    //{
                    //    UpdateQueue(agvtaskService, task);
                    //}
                }
                #endregion

                #region MyRegion
                //var tasks = agvtaskService.Find(x => x.agv_taskstate == "Queue").OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).ToList();
                //foreach (var task in tasks)
                //{
                //    try
                //    {
                //        if (task.agv_tasktype == "TaskType_EmptyPallet")//空托任务
                //        {
                //            if (task.agv_fromaddress == "" && DateTime.Now - task.agv_createtime >= TimeSpan.FromMinutes(2))
                //            {
                //                if (task.agv_tasknum.Contains("_"))
                //                {
                //                    string mainTaskNum = task.agv_tasknum.Split('_')[0];
                //                    if (agvtaskService.Find(x => x.agv_tasknum == mainTaskNum && task.agv_taskstate != "Executing" && task.agv_taskstate != "Create").Any() || !agvtaskService.Find(x => x.agv_tasknum == mainTaskNum).Any())
                //                        GetStation.EmptyPalletStation(task);
                //                }
                //                else
                //                    GetStation.EmptyPalletStation(task);

                //                WriteDBLog.Success("更新空托队列任务", $"任务编号：{task.agv_tasknum}", "PCS");
                //                continue;
                //            }
                //        }
                //        else if (task.agv_tasktype == "TaskType_OutsourceInbound" || task.agv_tasktype == "TaskType_Inbound")//外协库入库/AB库入库
                //        {
                //            if (task.agv_toaddress == "")
                //            {
                //                var stationinfo = stationinfoRepository.Find(x => x.stationCode == task.agv_fromaddress).FirstOrDefault();
                //                var work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.drawingNo == stationinfo.stationType && x.heatID == stationinfo.heatNumber && x.processCode == "17").FirstOrDefault();
                //                var TargetLocation = task.agv_tasktype == "TaskType_Inbound" ? GetLocation.GetEmptyLocation(stationinfoRepository, work, task) : StationTask.GetEmptyLocation(stationinfoRepository);
                //                if (TargetLocation != null)
                //                {
                //                    if (agvtaskService.Find(x => x.agv_toaddress == TargetLocation.stationCode).Any()) continue;
                //                    task.agv_taskstate = "Create";
                //                    task.agv_toaddress = TargetLocation.stationCode;
                //                    TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
                //                    TargetLocation.billetID = stationinfo.billetID;
                //                    TargetLocation.stationType = task.agv_materielid;
                //                    TargetLocation.heatNumber = stationinfo.heatNumber;
                //                    TargetLocation.Number = task.jobID;
                //                    stationinfoRepository.Update(TargetLocation, true);
                //                    agvtaskService.Update(task, true);
                //                    WriteDBLog.Success("更新入库队列任务", $"任务编号：{task.agv_tasknum}", "PCS");
                //                    continue;
                //                }
                //            }
                //        }
                //        else if (task.agv_tasktype == "TaskType_OutsourceOutbound" || task.agv_tasktype == "TaskType_Outbound")//外协库出库/AB库出库
                //        {
                //            if (task.agv_toaddress == "")
                //            {
                //                var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("S01001") && (x.tray_status == "EmptyTray" || x.location_state == "Empty") && x.enable).ToList();
                //                foreach (var EmptyStation in EmptyStations)
                //                {
                //                    if (agvtaskService.Find(x => x.agv_toaddress == EmptyStation.stationCode).Any()) continue;
                //                    task.agv_taskstate = "Create";
                //                    task.agv_toaddress = EmptyStation.stationCode;
                //                    EmptyStation.location_state = LocationStateEnum.Busy.ToString();
                //                    stationinfoRepository.Update(EmptyStation, true);
                //                    agvtaskService.Update(task, true);
                //                    WriteDBLog.Success("更新出库队列任务", $"任务编号：{task.agv_tasknum}", "PCS");
                //                    return;
                //                }
                //            }
                //        }
                //        else if (task.agv_tasktype == "TaskType_OutsourceCarry")//移库外协
                //        {
                //            if (task.agv_toaddress == "")
                //            {
                //                var TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);
                //                if (TargetLocation != null)
                //                {
                //                    if (agvtaskService.Find(x => x.agv_toaddress == TargetLocation.stationCode).Any()) continue;

                //                    task.agv_taskstate = "Create";
                //                    task.agv_toaddress = TargetLocation.stationCode;
                //                    TargetLocation.location_state = LocationStateEnum.OutBusy.ToString();
                //                    TargetLocation.stationType = task.agv_materielid;
                //                    stationinfoRepository.Update(TargetLocation, true);
                //                    agvtaskService.Update(task, true);
                //                    WriteDBLog.Success("更新移库外协队列任务", $"任务编号：{task.agv_tasknum}", "PCS");
                //                    continue;
                //                }
                //            }
                //        }
                //    }
                //    catch (Exception ex)
                //    {
                //        //WriteDBLog.Error("更新队列任务", $"错误信息：{ex.Message}", "PCS");
                //        WriteLog.Write_Log("更新队列任务", "更新失败", "", $"错误信息：{ex.Message}");
                //    }
                //}
                #endregion

            }
@@ -156,12 +67,12 @@
            Idt_management_timeRepository timeRepository = new dt_management_timeRepository(Context);
            try
            {
                if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString())//空托任务
                if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString())//补空托任务
                {
                    var val = timeRepository.Find(x => x.management_name == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString()).FirstOrDefault().management_numericalvalue;
                    if (agvtask.agv_fromaddress == "" && agvtask.agv_toaddress.Contains("W"))
                    if (string.IsNullOrEmpty(agvtask.agv_fromaddress) && agvtask.agv_toaddress.Contains("W"))
                        GetStation.EmptyPalletStation(agvtask);
                    else if (agvtask.agv_fromaddress == "" && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(val))
                    else if (string.IsNullOrEmpty(agvtask.agv_fromaddress) && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(val))
                    {
                        if (agvtask.agv_tasknum.Contains("_"))
                        {
@@ -172,14 +83,13 @@
                        else
                            GetStation.EmptyPalletStation(agvtask);
                    }
                    WriteDBLog.Success("更新空托队列任务", $"任务编号：{agvtask.agv_tasknum}", "PCS");
                }
                else if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString() || agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString())//外协库入库/AB库入库
                {
                    if (agvtask.agv_toaddress == "")
                    if (string.IsNullOrEmpty(agvtask.agv_toaddress))
                    {
                        var stationinfo = stationinfoRepository.Find(x => x.stationCode == agvtask.agv_fromaddress).FirstOrDefault();
                        var work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.drawingNo == stationinfo.stationType && x.heatID == stationinfo.heatNumber && x.processCode == "17").FirstOrDefault();
                        var work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.drawingNo == stationinfo.stationType && x.heatID == stationinfo.heatNumber && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();
                        var TargetLocation = agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString() ? GetLocation.GetEmptyLocation(stationinfoRepository, work, agvtask) : StationTask.GetEmptyLocation(stationinfoRepository);
                        if (TargetLocation != null)
                        {
@@ -192,27 +102,36 @@
                                TargetLocation.stationType = agvtask.agv_materielid;
                                TargetLocation.heatNumber = stationinfo.heatNumber;
                                TargetLocation.Number = agvtask.jobID;
                                stationinfoRepository.Update(TargetLocation, true);
                                agvtaskService.Update(agvtask, true);
                                stationinfoRepository.Update(TargetLocation, x => new { x.location_state, x.billetID, x.stationType, x.heatNumber, x.Number }, true);
                                agvtaskService.Update(agvtask, x => new { x.agv_taskstate, x.agv_toaddress }, true);
                                WriteDBLog.Success("更新入库队列任务", $"任务编号：{agvtask.agv_tasknum}", "PCS");
                            }
                        }
                        else
                        {
                            if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString())
                            {
                                agvtask.agv_tasktype = AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString();
                                agvtaskService.Update(agvtask, x => new { x.agv_tasktype }, true);
                            }
                        }
                    }
                }
                else if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString() || agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString())//外协库出库/AB库出库
                {
                    if (agvtask.agv_toaddress == "")
                    if (string.IsNullOrEmpty(agvtask.agv_toaddress))
                    {
                        if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString())
                            if (GetStation.QueueStation(agvtask.agv_fromaddress)) return;//限制一行一次只能出一个任务
                        var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("S01001") && (x.tray_status == TrayStateEnum.EmptyTray.ToString() || x.location_state == LocationStateEnum.Empty.ToString()) && x.enable).ToList();
                        //var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("S01001") && (x.tray_status == TrayStateEnum.EmptyTray.ToString() || x.location_state == LocationStateEnum.Empty.ToString()) && x.enable).ToList();
                        var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("S01001") && x.enable).ToList();
                        foreach (var EmptyStation in EmptyStations)
                        {
                            if (agvtaskService.Find(x => x.agv_toaddress == EmptyStation.stationCode).Any()) continue;
                            agvtask.agv_taskstate = AGVTaskStateEnum.Create.ToString();
                            agvtask.agv_toaddress = EmptyStation.stationCode;
                            EmptyStation.location_state = LocationStateEnum.Busy.ToString();
                            stationinfoRepository.Update(EmptyStation, true);
                            //EmptyStation.location_state = LocationStateEnum.Busy.ToString();
                            //stationinfoRepository.Update(EmptyStation, true);
                            agvtaskService.Update(agvtask, true);
                            WriteDBLog.Success("更新出库队列任务", $"任务编号：{agvtask.agv_tasknum}", "PCS");
                            return;
@@ -221,7 +140,7 @@
                }
                else if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())//移库外协
                {
                    if (agvtask.agv_toaddress == "")
                    if (string.IsNullOrEmpty(agvtask.agv_toaddress))
                    {
                        if (GetStation.QueueStation(agvtask.agv_fromaddress)) return;//限制一行一次只能出一个任务
                        var TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);