From 4a6319fa5be9ef5f9741c3507825667f523d9b2b Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期四, 30 四月 2026 09:27:12 +0800
Subject: [PATCH] 4-30 叫料&拉出空框代码已写完

---
 项目代码/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 5907898..43c1416 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -15,6 +15,7 @@
 using WIDESEAWCS_BasicInfoService;
 using WIDESEAWCS_Common;
 using WIDESEAWCS_Common.APIEnum;
+using WIDESEAWCS_Common.StationEnum;
 using WIDESEAWCS_Common.TaskEnum;
 using WIDESEAWCS_Core;
 using WIDESEAWCS_Core.BaseRepository;
@@ -428,7 +429,7 @@
                 catch { }
                 stringBuilder.Append($",浠诲姟鐘舵�佺敱{oldStatus}鍙樻洿涓簕newStatus}");
 
-                task.TaskState = taskStatus.ObjToInt();
+                task.TaskState = (int)taskStatus;
             }
             BaseDal.UpdateData(task);
             _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, stringBuilder.ToString());
@@ -454,13 +455,25 @@
                     WriteLog.Write_Log("浠诲姟瀹屾垚", "浠诲姟瀹屾垚鎺ュ彛", "浠诲姟鍙�", $"浠诲姟锛歿taskNum}");
 
                     // 鍐嶆鏌ヨ浠诲姟鐘舵�侊紝闃叉鍦ㄩ攣绛夊緟鏈熼棿浠诲姟鐘舵�佸凡鏀瑰彉
-                    Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+                    Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
                     if (task == null)
                     {
                         return content.Error($"浠诲姟{taskNum}涓嶅瓨鍦�");
                     }
                     //浠诲姟瀹屾垚閫昏緫
                     _unitOfWorkManage.BeginTran();
+                    // 鎶婂綋鍓嶄换鍔℃煡鍑烘潵 鐒跺悗姣忎竴涓瓧娈佃祴鍊肩粰鍘嗗彶浠诲姟 鐒跺悗鍒犻櫎褰撳墠浠诲姟 娣诲姞涓�鏉″巻鍙蹭换鍔� // 鐒跺悗鎶婅繖涓换鍔$殑缁堢偣鐨勫搴旂珯鍙扮殑鐘舵�佽缃负鍚敤
+                    Dt_Task_Hty dt_Task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+                    dt_Task_Hty.TaskNum = task.TaskId;
+
+                    Dt_StationManager dt_StationManager = _stationManagerRepository.QueryFirst(x => x.StationLocation == task.TargetAddress);
+                    if(dt_StationManager == null) return content.Error($"浠诲姟{taskNum}鐨勫綋鍓嶇珯鍙颁笉瀛樺湪");
+
+                    dt_StationManager.StationStatus = ((int)StationEnum.Enable).ToString();
+
+                    _taskHtyRepository.AddData(dt_Task_Hty);
+                    BaseDal.DeleteData(task);
+                    _stationManagerRepository.UpdateData(dt_StationManager);
 
                     _unitOfWorkManage.CommitTran();
                     content.OK("浠诲姟瀹屾垚");

--
Gitblit v1.9.3