From 81946b468aff97b96fe50186246d3a853ce79b1b Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期五, 06 三月 2026 11:38:48 +0800
Subject: [PATCH] 增加已有任务超时提示在任务完成后自动清除
---
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
index 0a21fcb..23dd1b4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
@@ -7,6 +7,16 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+<<<<<<< HEAD
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_IPackInfoRepository;
+using WIDESEAWCS_Common.Utilities;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_IPackInfoService;
+=======
using WIDESEAWCS_Common.Utilities;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
@@ -17,11 +27,16 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_PackInfoRepository;
+>>>>>>> main
namespace WIDESEAWCS_PackInfoService
{
public class StationPackInfoService : ServiceBase<Dt_StationPackInfo, IStationPackInfoRepository>, IStationPackInfoService
{
+<<<<<<< HEAD
+ public StationPackInfoService(IStationPackInfoRepository BaseDal) : base(BaseDal)
+ {
+=======
private readonly IStationPackDetailRepository _stationPackDetailRepository;
private readonly IPackinfoRepository _packInfoRepository;
private readonly IPackaxisTaskRepository _packaxisTaskRepository;
@@ -74,6 +89,7 @@
WebResponseContent.Instance.Error(e.Message);
}
return content;
+>>>>>>> main
}
}
}
--
Gitblit v1.9.3