From be291df6dd14039ff58e8c6554a053db4b573954 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 26 二月 2026 18:17:25 +0800
Subject: [PATCH] 优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs | 9 ++++++++-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/UpdateGALAXISTaskGrade.cs | 2 +-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 33 +++++++++++++++++++++------------
3 files changed, 30 insertions(+), 14 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
index 02fd846..46983b9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
@@ -99,7 +99,14 @@
/// 浠诲姟搴熸
/// </summary>
[Description("浠诲姟搴熸")]
- Cancel
+ Cancel,
+
+ /// <summary>
+ /// wms鍙栨秷浠诲姟
+ /// </summary>
+ [Description("WMS鍙栨秷浠诲姟")]
+ WMSCancel,
+
#endregion
#region 娴峰悍AGV鍏朵粬浠诲姟鐘舵��
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/UpdateGALAXISTaskGrade.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/UpdateGALAXISTaskGrade.cs"
index d19fc6c..7ac7ace 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/UpdateGALAXISTaskGrade.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/UpdateGALAXISTaskGrade.cs"
@@ -22,7 +22,7 @@
/// <summary>
/// 浠诲姟搴撳尯
/// </summary>
- public string district { get; set; }
+ public string district { get; set; } = "cy";
/// <summary>
/// 鏂扮殑浼樺厛绾�
/// </summary>
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 f7722d1..abada7f 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"
@@ -26,6 +26,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.TaskInfo;
@@ -144,7 +145,7 @@
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
-
+
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
@@ -153,13 +154,13 @@
//娴峰悍
bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
//杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
- dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();
+ dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
if (isGALAXISTask)
{
- var KLS = new CancelGALAXISTask
- {
- taskId= dt_Task.WMSTaskNum,
- reportTime=DateTime.Now.ToString()
+ var KLS = new CancelGALAXISTask
+ {
+ taskId = dt_Task.WMSTaskNum,
+ reportTime = DateTime.Now.ToString()
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelGALAXISTask));
if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
@@ -167,11 +168,16 @@
GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
if (agvContent.success == true && agvContent.code == 0)
{
- BaseDal.UpdateData(dt_Task);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ }
+ else
+ {
+ return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+
}
}
- content.Error("鍙栨秷浠诲姟澶辫触");
}
catch (Exception ex)
{
@@ -221,12 +227,15 @@
GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
if (agvContent.success == true && agvContent.code == 0)
{
- BaseDal.UpdateData(dt_Task);
- return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+
+ return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ }
+ else {
+ return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
}
}
#endregion
- content.Error("淇敼浠诲姟浼樺厛绾уけ璐�");
+
}
catch (Exception ex)
{
--
Gitblit v1.9.3