From 1caea0fdc7ed1788d854a2aba8853984b4494e01 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 24 六月 2025 09:56:28 +0800
Subject: [PATCH] 代码提交
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
index e550f3a..d5437c8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
@@ -208,11 +208,11 @@
/// 鏌ヨAGV鏂板缓浠诲姟
/// </summary>
/// <returns></returns>
- public Dt_Task GetTasks()
+ public List<Dt_Task> GetTasks()
{
WebResponseContent content = new WebResponseContent();
- Expression<Func<Dt_Task, bool>> expressionOrder = x => true;
- return BaseDal.QueryFirst(x => x.TaskStatus == AGVTaskStatusEnum.AGV_New.ObjToInt());
+ //Expression<Func<Dt_Task, bool>> expressionOrder = x => true;
+ return BaseDal.QueryData(x => x.TaskStatus == AGVTaskStatusEnum.AGV_New.ObjToInt() || x.TaskStatus == AGVTaskStatusEnum.AGV_Wait.ObjToInt()).ToList();
}
/// <summary>
/// 鏌ヨ鍘熸潗鏂欏嚭搴撲换鍔�
@@ -221,8 +221,8 @@
public Dt_Task GetTasksout()
{
WebResponseContent content = new WebResponseContent();
- Expression<Func<Dt_Task, bool>> expressionOrder = x => true;
- return BaseDal.QueryFirst(x => x.TaskType == TaskTypeEnum.Outbound.ObjToInt()&&x.SourceAddress.Contains("鍘熸潗鏂�")&&x.TaskStatus==AGVTaskStatusEnum.AGV_Query.ObjToInt());
+ //Expression<Func<Dt_Task, bool>> expressionOrder = x => true;
+ return BaseDal.QueryFirst(x => x.TaskType == TaskTypeEnum.Outbound.ObjToInt() && x.SourceAddress.Contains("鍘熸潗鏂�") && x.TaskStatus == AGVTaskStatusEnum.AGV_Query.ObjToInt());
}
/// <summary>
/// 鏌ヨ鎴愬搧鏈夎揣璐т綅
@@ -347,15 +347,26 @@
{
int TaskStatus = AGVTaskStatusEnum.AGV_Cancel.ObjToInt();
_taskHtyService.AddTaskHty(task, TaskStatus);
+ HCJFree(task, TaskStatus);
BaseDal.DeleteData(task);
WriteLog.GetLog("鏃犱汉鍙夎溅浠诲姟鍙栨秷").Write("浠诲姟鍙凤細" + task.TaskNum, "鏃犱汉鍙夎溅浠诲姟鍙栨秷");
}
- //else if (taskState == 91)
- //{
- // int TaskStatus = AGVTaskStatusEnum.AGV_Fail.ObjToInt();
- // _taskHtyService.AddTaskHty(task, TaskStatus);
- // BaseDal.DeleteData(task);
- //}
+ else if (taskState == 91)
+ {
+ int TaskStatus = AGVTaskStatusEnum.AGV_Fail.ObjToInt();
+ _taskHtyService.AddTaskHty(task, TaskStatus);
+ HCJFree(task, TaskStatus);
+ BaseDal.DeleteData(task);
+ }
+ else if (taskState == 93)
+ {
+ int TaskStatus = AGVTaskStatusEnum.AGV_Complete.ObjToInt();
+ if (task.SourceAddress.Contains("鍘熸潗鏂欏簱"))
+ {
+ HCJCope(task, TaskStatus);
+ }
+ BaseDal.UpdateData(task);
+ }
else if (taskState == 60)
{
task.TaskStatus = AGVTaskStatusEnum.AGV_Executing.ObjToInt();
@@ -523,7 +534,7 @@
if (res.success)
{
int TaskStatus = AGVTaskStatusEnum.AGV_Finish.ObjToInt();
- _taskHtyService.AddTaskHty(task, TaskStatus);
+ //_taskHtyService.AddTaskHty(task, TaskStatus);
BaseDal.DeleteData(task);
return WebResponseContent.Instance.OK();
}
--
Gitblit v1.9.3