From baad30699918c536d0b96e36df70b8f352d520e4 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期五, 15 八月 2025 10:15:53 +0800
Subject: [PATCH] 同步
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
index f0812fe..93ed9db 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
@@ -1,6 +1,8 @@
锘縰sing log4net.Core;
+using Mapster;
using Masuit.Tools;
using System.Collections.Generic;
+using System.Threading.Tasks;
using WIDESEA_Comm.AGVTask;
using WIDESEA_Comm.WCSInterface.Requst;
using WIDESEA_Common;
@@ -163,7 +165,7 @@
private DtLocationInfo GetEmptyLocation(List<DtLocationInfo> dtLocationInfos)
{
- var locationinfo = dtLocationInfos.Where(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).OrderBy(x => x.Layer).ThenByDescending(x => x.Depth).ThenBy(x => x.Row).ThenBy(x => x.Column).FirstOrDefault();
+ var locationinfo = dtLocationInfos.Where(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).OrderBy(x => x.Column).ThenBy(x => x.Row).ThenBy(x => x.Layer).FirstOrDefault(); //.ThenByDescending(x => x.Depth)
return locationinfo;
}
@@ -171,4 +173,30 @@
#endregion 鑾峰彇璐т綅
#endregion 搴撲綅鍒嗛厤
+ public WebResponseContent confirmTask(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var taskInfo = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (taskInfo != null)
+ {
+ var taskHty = taskInfo.Adapt<Dt_Task_Hty>();
+ taskHty.FinishTime = DateTime.Now;
+ taskHty.OperateType = (int)OperateTypeEnum.浜哄伐纭;
+
+ BaseDal.DeleteData(taskInfo);
+ _task_HtyRepository.AddData(taskHty);
+ }
+
+ content.OK("纭瀹屾垚");
+ }
+ catch (Exception ex)
+ {
+ content.Error($"纭寮傚父:{ex.Message}");
+ }
+
+ return content;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3