From 23e4f986644298cb23ac43173414b7e1404b6657 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 15 六月 2024 17:26:23 +0800
Subject: [PATCH] 任务逻辑优化
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/SendToaddress.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/SendToaddress.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/SendToaddress.cs"
index eb980ec..27ada93 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/SendToaddress.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/SendToaddress.cs"
@@ -27,12 +27,14 @@
Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(Context);
RequestToaddTask requestFromTask = new RequestToaddTask();
var agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == AGVTaskStateEnum.Complete.ToString() && x.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString() && string.IsNullOrEmpty(x.agv_toaddress)).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).ToList();
+
+ var tasks = agvtaskRepository.Find(x => x.agv_taskstate == AGVTaskStateEnum.Queue.ToString() && x.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString() && string.IsNullOrEmpty(x.agv_fromaddress)).ToList();//鏌ユ壘鎵�鏈夎ˉ绌烘墭浠诲姟
foreach (var agv_task in agv_tasks)
{
try
{
#region 鏌ユ壘婊¤冻鏉′欢鐨勮ˉ绌烘墭浠诲姟
- var task = agvtaskRepository.Find(x => x.agv_taskstate == AGVTaskStateEnum.Queue.ToString() && x.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString() && x.agv_Traytype == agv_task.agv_Traytype && string.IsNullOrEmpty(x.agv_fromaddress)).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).FirstOrDefault();
+ var task = tasks.Where(x => x.agv_Traytype == agv_task.agv_Traytype).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).FirstOrDefault();
if (task != null)
{
requestFromTask.TASK_NO = agv_task.agv_tasknum;
@@ -54,10 +56,11 @@
agv_task.agv_toaddress = task.agv_toaddress;
agvtaskRepository.Update(agv_task, true);
agvtaskRepository.Delete(task, true);
+ tasks.Remove(task);
}
else
throw new Exception(respone.Msg);
- WriteDBLog.Success("鏇存柊鑷姩鍙栫┖鎵橀槦鍒椾换鍔�", $"浠诲姟缂栧彿锛歿agv_task.agv_tasknum}", "WMS");
+ WriteDBLog.Success("鏇存柊鑷姩鍙栫┖鎵橀槦鍒椾换鍔�", $"浠诲姟缂栧彿锛歿agv_task.agv_tasknum},鍒犻櫎琛ョ┖鎵樹换鍔★細{task.agv_tasknum}", "WMS");
}
#endregion
else
@@ -66,9 +69,6 @@
var EmptyStation = EmptyTray.GetEmptyTrayStation(stationinfoRepository, agv_task);
if (EmptyStation != null)
{
- //agv_task.agv_taskstate = AGVTaskStateEnum.Create.ToString();
- //agvtaskRepository.Update(agv_task, true);//鏌ョ湅AGV浠诲姟鏁版嵁鏄惁鍦ㄥ彟涓�涓柟娉曞唴杩涜浜嗘暟鎹洿鏂�
-
requestFromTask.TASK_NO = agv_task.agv_tasknum;
requestFromTask.TO_POSITION = EmptyStation.stationCode;
requestFromTask.Material = agv_task.agv_materielid;
--
Gitblit v1.9.3