From 804051e9e3013a3ad6b3e47757050e32893cf4fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 27 二月 2026 17:22:25 +0800
Subject: [PATCH] WCS堆垛机流程
---
代码管理/WCS/WCSServers/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 124 ++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 75 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServers/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServers/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
index 35ef6b0..38cf808 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServers/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServers/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
@@ -57,22 +57,6 @@
// 鑾峰彇浠诲姟鐘舵��
int taskState = task.TaskState;
- // 灏濊瘯灏嗕换鍔＄姸鎬佽浆鎹负TaskOutStatusEnum鏋氫妇绫诲瀷
- if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result))
- {
- // 濡傛灉杞崲澶辫触锛屽垯灏嗕换鍔＄姸鎬佽浆鎹负TaskInStatusEnum鏋氫妇绫诲瀷
- if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskState.ToString()).ToString(), out result))
- {
- // 濡傛灉杞崲澶辫触锛屽垯灏唅sNormal璁剧疆涓篺alse
- isNormal = false;
- }
- }
- // 濡傛灉杞崲鎴愬姛锛屽垯鍒ゆ柇浠诲姟鐘舵�佹槸鍚﹀ぇ浜嶰utFinish
- else if ((int)(TaskOutStatusEnum)result > (int)TaskOutStatusEnum.OutFinish)
- {
- // 濡傛灉澶т簬锛屽垯灏唅sNormal璁剧疆涓篺alse
- isNormal = false;
- }
// 鍒涘缓浠诲姟鎵ц璇︽儏瀵硅薄
Dt_TaskExecuteDetail taskExecuteDetail = new()
{
@@ -116,16 +100,6 @@
int taskNum = task.TaskNum;
int taskState = task.TaskState;
- if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result))
- {
- if ((int)(TaskOutStatusEnum)result > (int)TaskOutStatusEnum.OutFinish)
- isNormal = false;
- }
- else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskState.ToString()).ToString(), out result))
- {
- if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish)
- isNormal = false;
- }
Dt_TaskExecuteDetail taskExecuteDetail = new()
{
IsManual = App.User.UserId > 0,
@@ -161,57 +135,57 @@
if (task != null)
{
- if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
- {
- steps = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().Where(x => x <= (int)TaskOutStatusEnum.OutFinish).ToList();
+ //if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
+ //{
+ // steps = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().Where(x => x <= (int)TaskOutStatusEnum.OutFinish).ToList();
- foreach (var item in steps)
- {
- object obj;
- FieldInfo? fieldInfo = typeof(TaskOutStatusEnum).GetField(((TaskOutStatusEnum)item).ToString());
- DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
- if (descriptionAttribute != null)
- {
- obj = new { title = item, description = descriptionAttribute.Description };
- }
- else
- {
- obj = new { title = item, description = ((TaskOutStatusEnum)item).ToString() };
- }
- list.Add(obj);
- }
- }
- else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
- {
- steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x <= (int)TaskInStatusEnum.InFinish).ToList();
- foreach (var item in steps)
- {
- object obj;
- FieldInfo? fieldInfo = typeof(TaskInStatusEnum).GetField(((TaskInStatusEnum)item).ToString());
- DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
- if (descriptionAttribute != null)
- {
- obj = new { title = item, description = descriptionAttribute.Description };
- }
- else
- {
- obj = new { title = item, description = ((TaskInStatusEnum)item).ToString() };
- }
- list.Add(obj);
- }
- }
- else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
- {
- //todo 璋冪敤WMS绉诲簱瀹屾垚
- }
- else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
- {
+ // foreach (var item in steps)
+ // {
+ // object obj;
+ // FieldInfo? fieldInfo = typeof(TaskOutStatusEnum).GetField(((TaskOutStatusEnum)item).ToString());
+ // DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ // if (descriptionAttribute != null)
+ // {
+ // obj = new { title = item, description = descriptionAttribute.Description };
+ // }
+ // else
+ // {
+ // obj = new { title = item, description = ((TaskOutStatusEnum)item).ToString() };
+ // }
+ // list.Add(obj);
+ // }
+ //}
+ //else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
+ //{
+ // steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x <= (int)TaskInStatusEnum.InFinish).ToList();
+ // foreach (var item in steps)
+ // {
+ // object obj;
+ // FieldInfo? fieldInfo = typeof(TaskInStatusEnum).GetField(((TaskInStatusEnum)item).ToString());
+ // DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ // if (descriptionAttribute != null)
+ // {
+ // obj = new { title = item, description = descriptionAttribute.Description };
+ // }
+ // else
+ // {
+ // obj = new { title = item, description = ((TaskInStatusEnum)item).ToString() };
+ // }
+ // list.Add(obj);
+ // }
+ //}
+ //else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
+ //{
+ // //todo 璋冪敤WMS绉诲簱瀹屾垚
+ //}
+ //else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
+ //{
- }
- else
- {
- throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
- }
+ //}
+ //else
+ //{
+ // throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
+ //}
active = steps.IndexOf(task.TaskState) + 1;
}
--
Gitblit v1.9.3