From 51af2794f47d5b68496edbc09d0ccb168347f02b Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期六, 22 十一月 2025 10:19:05 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 9181cac..63937d9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -1,4 +1,4 @@
-锘�#region << 鐗� 鏈� 娉� 閲� >>
+#region << 鐗� 鏈� 娉� 閲� >>
/*----------------------------------------------------------------
* 鍛藉悕绌洪棿锛歐IDESEAWCS_TaskInfoService
* 鍒涘缓鑰咃細鑳＄搴�
@@ -407,9 +407,14 @@
//int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
-
- task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
-
+ if (task.TaskState ==(int)TaskOutStatusEnum.SC_OutFinish)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
+ }
+ else
+ {
+ task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
+ }
task.Dispatchertime = DateTime.Now;
}
else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
@@ -444,7 +449,11 @@
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
- BaseDal.UpdateData(task);
+ bool res = BaseDal.UpdateData(task);
+ if (!res)
+ {
+ return content = WebResponseContent.Instance.Error($"鏇存柊浠诲姟淇℃伅澶辫触,浠诲姟鍙�:銆恵task.TaskNum}銆�");
+ }
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
@@ -629,6 +638,9 @@
{
task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
bool res = BaseDal.UpdateData(task);
+ // 娣诲姞鍏ュ簱鍘嗗彶璁板綍
+ //AddTaskHistory(task);
+
return res;
}
@@ -644,6 +656,7 @@
// 娣诲姞鍏ュ簱鍘嗗彶璁板綍
// _task_HtyService.AddTaskHty(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "鍏ュ簱瀹屾垚");
+ //AddTaskHistory(task);
// 鍏ュ簱瀹屾垚鍚庡垹闄や换鍔�
bool res = BaseDal.DeleteData(task);
@@ -660,7 +673,7 @@
BaseDal.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "绉诲簱瀹屾垚");
-
+ //AddTaskHistory(task);
// 绉诲簱瀹屾垚鍚庡垹闄や换鍔�
bool res = BaseDal.DeleteData(task);
// _task_HtyService.AddTaskHty(task);
@@ -849,7 +862,7 @@
public Dt_Task GetOutTaskInfo2(string PalletCode)
{
- return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish, TaskOrderBy);
}
public List<Dt_Task> QueryStackerCraneYKTasks(string deviceNo)
@@ -857,5 +870,53 @@
return BaseDal.QueryData(x => x.Roadway == deviceNo && x.TaskType == (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew, TaskOrderBy);
}
+
+ public WebResponseContent WCSCancelinventory(int taskNum)
+ {
+ //鏌ヨ浠诲姟淇℃伅
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ bool taskmsseg = BaseDal.DeleteData(task);
+ //bool res = AddTaskHistory(task);
+ //return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
+ return null;
+
+ }
+
+ /// <summary>
+ /// 娣诲姞鍘嗗彶浠诲姟璁板綍锛堥潤鎬佹柟娉曪級
+ /// </summary>
+ /// <param name="task">浠诲姟瀵硅薄</param>
+ /// <returns>鏄惁娣诲姞鎴愬姛</returns>
+ public static bool AddTaskHistory(Dt_Task task)
+ {
+ try
+ {
+ if (task == null)
+ {
+ return false;
+ }
+
+ // 鍒涘缓浠诲姟鍘嗗彶鏈嶅姟瀹炰緥
+ var taskHtyService = App.GetService<ITaskHtyService>();
+ if (taskHtyService == null)
+ {
+ return false;
+ }
+
+ // 娣诲姞鍘嗗彶璁板綍
+ bool result = taskHtyService.AddTaskHistory(task, "鑷姩瀹屾垚");
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父鏃ュ織
+ Console.WriteLine($"娣诲姞鍘嗗彶浠诲姟璁板綍澶辫触: {ex.Message}");
+ return false;
+ }
+ }
+
+
}
}
--
Gitblit v1.9.3