From 58bd958f1fa8a85d0a3ac33a1ab1e2cab5d63dd2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 20 六月 2024 20:18:46 +0800
Subject: [PATCH] 按照SN号查询最新的工单
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs | 115 ++++++---------------------------------------------------
1 files changed, 12 insertions(+), 103 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 132ea1d..89a6307 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"
@@ -47,100 +47,6 @@
}
#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
-
}
catch (Exception ex)
{
@@ -153,11 +59,15 @@
VOLContext Context = new VOLContext();
Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(Context);
IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(Context);
+ 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())//琛ョ┖鎵樹换鍔�
{
- if (agvtask.agv_fromaddress == "" && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(2))
+ var val = timeRepository.Find(x => x.management_name == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString()).FirstOrDefault().management_numericalvalue;
+ if (agvtask.agv_fromaddress == "" && agvtask.agv_toaddress.Contains("W"))
+ GetStation.EmptyPalletStation(agvtask);
+ else if (agvtask.agv_fromaddress == "" && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(val))
{
if (agvtask.agv_tasknum.Contains("_"))
{
@@ -167,16 +77,14 @@
}
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)
{
@@ -202,14 +110,15 @@
{
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;
--
Gitblit v1.9.3