From 5662395113163ac87425f23aa0bff8853be92462 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 06 三月 2024 10:46:27 +0800
Subject: [PATCH] 优化逻辑
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
index 1a470f2..f4cb0d3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
@@ -5,6 +5,7 @@
using WIDESEA_Entity.DomainModels;
using WIDESEA_Entity.ToAGV;
using WIDESEA_WMS.Common;
+using WIDESEA_WMS.Common.AGVTask;
using WIDESEA_WMS.IRepositories;
using WIDESEA_WMS.Repositories;
@@ -38,12 +39,18 @@
if (tasteInfo.TASK_State < 1 || tasteInfo.TASK_State > 4)
throw new Exception("鏈畾涔夌殑浠诲姟鐘舵��:" + tasteInfo.TASK_State);
var StateName = Enum.GetName(typeof(AGVTaskStateEnum), tasteInfo.TASK_State);
- if (task.agv_taskstate == StateName)
+ if (task.agv_taskstate == StateName && task.agv_taskstate != AGVTaskStateEnum.Complete1.ToString())
{
respone.success = 2;
respone.Message = tasteInfo.TASK_NO + "锛氶噸澶嶈皟鐢紝浠诲姟鐘舵�佷负锛�" + tasteInfo.TASK_State;
return respone;
}
+ #region 鍒ゆ柇浠诲姟鐘舵��
+ //List<string> list = new List<string>() { AGVTaskStateEnum.Executing.ToString(), AGVTaskStateEnum.Complete.ToString(), AGVTaskStateEnum.Executing1.ToString(), AGVTaskStateEnum.Complete1.ToString() };
+ //var index = list.IndexOf(task.agv_taskstate) + 1;
+ //if (tasteInfo.TASK_State < index)
+ // throw new Exception("浠诲姟鐘舵�佹洿鏂板紓甯革紒褰撳墠浠诲姟鐘舵�佷负锛�" + index + ";璇锋眰鏇存柊鐘舵�佷负锛�" + tasteInfo.TASK_State);
+ #endregion
if (tasteInfo.TASK_State == (int)AGVTaskStateEnum.Executing)
task.agv_executingBeginTime = DateTime.Now;
else if (tasteInfo.TASK_State == (int)AGVTaskStateEnum.Complete)
@@ -56,9 +63,11 @@
throw new Exception("浠诲姟鐘舵�佹洿鏂板け璐ワ紒浠诲姟ID锛�" + tasteInfo.TASK_NO + "锛涗换鍔＄姸鎬侊細" + tasteInfo.TASK_State);
if (tasteInfo.TASK_State == (int)AGVTaskStateEnum.Complete1)
{
- HandleTask.AddHtyTask(task);
+ task.agv_finishedtime = DateTime.Now;
+ //HandleTask_Mes.UploadMESInfo(task);
HandleTask.Updateinventory(task);
HandleTask.AutoUpdateHCJState(task);
+ HandleTask.AddHtyTask(task);
}
}
catch (Exception ex)
--
Gitblit v1.9.3