From cb385f0b515c738b503c5c75c9d7efcec323716d Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期五, 28 二月 2025 09:12:40 +0800
Subject: [PATCH] 数据库脚本提交
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index e634901..e735e1a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -1107,8 +1107,14 @@
}
- else
+ else//涓婃枡浠诲姟涔熸敼涓哄己鍒跺畬鎴�20250115
{
+ //鏇存柊鐘舵�佷负浠诲姟瀹屾垚
+ //task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ //UpdateTaskStatus(task.TaskId, task.TaskState);
+ //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
+ //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍑哄簱浠诲姟瀹屾垚");
+ //isBack = true;
return WebResponseContent.Instance.Error($"涓婃枡浠诲姟涓嶅厑璁″己鍒跺畬鎴愶紒");
}
}
@@ -1149,6 +1155,26 @@
}
/// <summary>
+ /// 鍏佽閲嶇疆
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public WebResponseContent AGVResetTask()
+ {
+ WebResponseContent content = new WebResponseContent();
+ Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == "1");
+ if (task != null)
+ {
+ UpdateTaskAllowIn(task.TaskNum, 0);
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error($"鐩墠鏄厑璁GV杩涘叆鐘舵�侊紝鏃犻渶閲嶇疆锛�");
+ }
+ return content.Error("閲嶇疆鎴愬姛锛�");
+ }
+
+ /// <summary>
/// 浠诲姟鍙栨秷
/// </summary>
/// <param name="taskid"></param>
@@ -1162,6 +1188,12 @@
Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ //鍙栨秷浠诲姟鏃讹紝閲嶇疆鏄惁鍏佽杩涘叆
+ if (task.CurrentAddress == "1")
+ {
+ UpdateTaskAllowIn(task.TaskNum, 0);
+ }
+
Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress.ToString());
Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
bool isBack = false;
--
Gitblit v1.9.3