From 10797a680feaa24bdc17d10ac085e323be807819 Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@hnkhzn.com>
Date: 星期一, 18 十一月 2024 15:56:29 +0800
Subject: [PATCH] 202411-18 01
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 71e16ac..4316572 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -132,7 +132,12 @@
WebResponseContent content = new WebResponseContent();
try
{
- #region 鐪熷疄鏁版嵁
+ var hasTask = BaseDal.QueryFirst(x => x.PalletCode == palletCode);
+ if (hasTask != null)
+ {
+ return content;
+ }
+ #region 璇锋眰鍏ュ簱浠诲姟宸烽亾
// TODO: 璋冪敤鎺ュ彛鑾峰彇涓嬩竴涓湴鍧�
// 鍒涘缓璇锋眰瀵硅薄
RequestTaskDto request = new RequestTaskDto()
@@ -407,21 +412,28 @@
int oldState = task.TaskState;
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
- if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish)
- {
- return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- }
+ //if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish)
+ //{
+ // return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+ //}
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
task.TaskState = nextStatus;
+
+ if (task.TaskState == (int)TaskOutStatusEnum.Line_OutFinish)
+ {
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ BaseDal.DeleteData(task);
+ }
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
{
- if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
- {
- return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- }
+ //if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
+ //{
+ // return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+ //}
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
task.TaskState = nextStatus;
@@ -429,7 +441,7 @@
if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
{
- #region 鐪熷疄鏁版嵁
+ #region 鍏ュ簱璋冪敤鎺ュ彛鑾峰彇璐т綅鍦板潃
// TODO: 璋冪敤鎺ュ彛鑾峰彇璐т綅鍦板潃
// 鍒涘缓璇锋眰瀵硅薄
RequestTaskDto taskDto = new RequestTaskDto()
@@ -439,7 +451,7 @@
};
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
- var abc = HttpHelper.PostAsync("http://127.0.0.1:5000/api/Task/RequestTaskAsync", taskDto.ToJsonString()).Result;
+ var abc = HttpHelper.PostAsync("http://127.0.0.1:5000/api/Task/RequestLocationTaskAsync", taskDto.ToJsonString()).Result;
if (abc == null)
return content.Error();
// 鍙嶅簭鍒楀寲鍝嶅簲鍐呭
@@ -457,6 +469,14 @@
task.TargetAddress = task.NextAddress;
#endregion
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.SC_InFinish)
+ {
+
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+
+ BaseDal.DeleteData(task);
}
}
else
@@ -586,8 +606,11 @@
#region WMS鍚屾浠诲姟瀹屾垚
- //var x = new { taskNum = taskNum };
- var result = HttpHelper.GetAsync($"http://127.0.0.1:5000/api/Task/CompleteTaskAsync?taskNum={taskNum}").Result;
+ var keys = new Dictionary<string, object>()
+ {
+ {"taskNum", taskNum}
+ };
+ var result = HttpHelper.GetAsync($"http://127.0.0.1:5000/api/Task/CompleteTaskAsync", keys).Result;
content = JsonConvert.DeserializeObject<WebResponseContent>(result);
#endregion
#region 鏇存柊浠诲姟鐘舵��
--
Gitblit v1.9.3