From bb929bd0809eefc1108dd779846ff07d997f7ef0 Mon Sep 17 00:00:00 2001 From: huanghongfeng <huanghongfeng@hnkhzn.com> Date: 星期五, 19 七月 2024 09:25:14 +0800 Subject: [PATCH] 反馈MES工单完成 --- 代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs | 131 ++++++++----------------------------------- 1 files changed, 25 insertions(+), 106 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs" index 908a517..9942f46 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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 } @@ -159,9 +70,9 @@ 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); -- Gitblit v1.9.3