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 | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 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 f88d6c8..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,6 +44,11 @@ { 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 @@ -65,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("_")) { @@ -84,7 +89,7 @@ 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) { @@ -97,16 +102,24 @@ 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;//闄愬埗涓�琛屼竴娆″彧鑳藉嚭涓�涓换鍔� @@ -127,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