From 06e0e3b7d61e95902a6129de2490461cd0693e1d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 15 十月 2025 15:06:40 +0800
Subject: [PATCH] 新增异步方法并优化服务调用逻辑在多个数据库文件中进行了二进制文件的修改、删除和新增操作，可能涉及数据库内容的更新或重建。在 HttpsClient.cs文件中新增了 PostNotLimitAsync方法，用于发送支持 JSON 格式的异步 HTTP POST 请求，并记录请求和响应参数。在 AgingInOrOutInputService.cs文件中，将 HttpsClient.PostAsync替换为PostNotLimitAsync，以利用新方法的功能特性。同时删除了不再需要的注释代码。
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 371 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 300 insertions(+), 71 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 94fcd69..7323b07 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -1,10 +1,13 @@
-锘縰sing Masuit.Tools;
+锘縰sing Mapster;
+using Masuit.Tools;
+using SixLabors.Fonts.Tables.AdvancedTypographic;
using SqlSugar;
using WIDESEA_Common.CustomModels;
using WIDESEA_Core.Const;
+using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
-using WIDESEA_Model.Models.Basic;
+using WIDESEA_Model.Models;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;
@@ -184,6 +187,12 @@
if (!result.Success)
{
+ List<string> strings = new List<string>() { "2036","2038","2084","2086"};
+ if (input.Position.Contains(strings))
+ {
+ Console.WriteLine($"{result.MOMMessage}");
+ return null;
+ }
var taskNG = new Dt_Task
{
CurrentAddress = input.Position,
@@ -204,6 +213,7 @@
ProcessCode = result.ProcessCode,
};
return taskNG;
+
}
if (result.SerialNos.Count <= 0)
@@ -587,17 +597,50 @@
#region 鐩存帴鍑哄簱浠诲姟瀹屾垚
- public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
+ public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task,DtStockInfo stock)
{
WebResponseContent content = new WebResponseContent();
try
{
- //娣诲姞鍘嗗彶
- var taskHty = CreateHistoricalTask(task);
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
- //鍒犻櫎浠诲姟
- BaseDal.DeleteData(task);
+ DtStockInfo_Hty stockInfo_Hty = null;
+ if (stock != null)
+ {
+ stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfo_Hty.ModifyDate = DateTime.Now;
+ }
+ var taskHty = task.Adapt<Dt_Task_Hty>();
+ taskHty.FinishTime = DateTime.Now;
+ taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
+
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
+
+ if(location != null)
+ {
+ int lastStatus = location.LocationStatus;
+ location.LocationStatus = (int)LocationEnum.Free;
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
+ }
+
+ task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+
+
+ // 浜嬪姟澶勭悊
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ if (stockInfo_Hty != null)
+ {
+ await DeleteStockInfoAsync(stock.Id);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await AddStockInfoHtyAsync(stockInfo_Hty);
+ }
+ if (location != null)
+ {
+ await UpdateLocationAsync(location);
+ }
+ await DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
+ });
return content.OK();
}
@@ -1039,20 +1082,36 @@
Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call");
if (station == null) { throw new Exception($"鏈壘鍒板寘瑁呯珯鍙颁俊鎭紝璇锋鏌ヤ紶鍏ュ弬鏁皗json.Position}"); }
+ EqptRunDto basic = new EqptRunDto()
+ {
+ EquipmentModel = "0",
+ Password ="",
+ EmployeeNo = "82412152",
+ SessionId = Guid.NewGuid().ToString(),
+ RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
+ Software = "鍖呰涓婃枡",
+ EquipmentCode = station.stationEquipMOM,
+ };
+ var result = _agingInOrOutInputService.Change(basic).Result;
+ var respone = JsonConvert.DeserializeObject<EqptRunDTO>(result.Data.ToString());
+ if(!result.Status || !respone.Success)
+ {
+ throw new Exception($"{station.productLine}鑾峰彇MOM鎹㈠瀷鏁版嵁寮傚父,寮傚父淇℃伅{respone.MOMMessage}");
+ }
+
var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
.Where(x => x.DeviceStatus == "1")
.Where(x => x.DeviceCode.Contains("CWSC")) // 杩囨护鏉′欢
.ToList().Select(x => x.DeviceCode).ToList();
- //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
- var outBoundMateriel = _dt_ChangeoversRepository.QueryData(x => x.Status == "1").ToList();
- List<string>? materielCodes = outBoundMateriel.Count != 0
- ? outBoundMateriel.Where(x => x.ProductionLine == station.productLine && x.ProcessCode == "CWSC3")
- .Select(x => x.MaterielCode)
- .ToList()
- : null;
+ //var outBoundMateriel = _dt_ChangeoversRepository.QueryData(x => x.Status == "1").ToList();
+ //List<string>? materielCodes = outBoundMateriel.Count != 0
+ // ? outBoundMateriel.Where(x => x.ProductionLine == station.productLine && x.ProcessCode == "CWSC3")
+ // .Select(x => x.MaterielCode)
+ // .ToList()
+ // : null;
- #region
+ #region Redis缂撳瓨鏌ヨ浠ｇ爜
//// 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
//IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
//List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
@@ -1072,22 +1131,45 @@
// .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
// .FirstOrDefault();
// 淇敼鍚庣殑鏌ヨ浠ｇ爜
- #endregion
- var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo)
- .Includes(x => x.StockInfoDetails)
- .Where(x => x.ProductionLine == station.productLine)
- .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true)
- // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)
- // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
- .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
- .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
- .OrderBy(x => x.OutboundTime)
- .FirstAsync();
+ //var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ // .Includes(x => x.LocationInfo)
+ // .Includes(x => x.StockInfoDetails)
+ // .Where(x => x.ProductionLine == station.productLine)
+ // .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true)
+ // // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
+ // .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)
+ // // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
+ // .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ // .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
+ // .OrderBy(x => x.OutboundTime)
+ // .FirstAsync();
+ #endregion
- if (stockInfo == null) throw new Exception($"搴撳唴{station.productLine}鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�");
+ DtStockInfo stockInfo = null;
+ var stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.ProductionLine == station.productLine
+ && x.AreaCode == "CWSC3"
+ && x.IsFull == true
+ && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .OrderBy(x => x.OutboundTime)
+ .ToListAsync();
+
+ foreach (var stock in stockInfoList)
+ {
+ var hasMatchingDetail = await _stockInfoRepository.Db.Queryable<DtStockInfoDetail>()
+ .Where(d => d.StockId == stock.Id && respone.PreProductNo.Contains(d.MaterielCode))
+ .AnyAsync();
+
+ if (hasMatchingDetail)
+ {
+ stockInfo = stock;
+ break;
+ }
+ }
+ if (stockInfo == null) throw new Exception($"CWSC3搴撳唴銆恵station.productLine}銆�,銆愮墿鏂欑紪鐮亄respone.PreProductNo}銆戞棤婊¤冻鏉′欢鐨勫簱瀛樺彲鍑哄簱");
DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.AreaId == 5 && x.LocationCode == stockInfo.LocationCode);
@@ -1108,14 +1190,12 @@
SourceAddress = stockInfo.LocationCode,
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = (int)TaskOutboundTypeEnum.Outbound,
- TaskNum = await BaseDal.GetTaskNo(),
+ TaskNum = BaseDal.GetTaskNo().Result,
Creater = "System",
ProductionLine = stockInfo.ProductionLine,
ProcessCode = stockInfo.ProcessCode,
};
-
WMSTaskDTO taskDTO = CreateTaskDTO(task);
-
int lastStatus = locationInfo.LocationStatus;
BaseDal.AddData(task);
@@ -1131,6 +1211,9 @@
catch (Exception ex)
{
Console.WriteLine($"CW3鑷冲寘瑁呭嚭搴撳紓甯�:{ex.ToString()}");
+
+ LogFactory.GetLog($"鍖呰璇锋眰鍑哄簱浠诲姟").Info(true, $"銆愬紓甯搞�戯細銆恵ex.Message}銆憑Environment.NewLine}銆恵ex.StackTrace}銆憑Environment.NewLine}{Environment.NewLine}");
+
return content.Error($"澶辫触锛歿ex.Message}");
}
}
@@ -1139,37 +1222,37 @@
#region 鐏鍑哄簱
- public WebResponseContent EmergencyTask(object obj)
+ public WebResponseContent EmergencyTask(Object obj)
{
WebResponseContent content = new WebResponseContent();
var emergencyTask = new DTSEmergencyTask();
try
{
+ Console.WriteLine($"鐏鍙傛暟:{obj.ToString()}");
emergencyTask = JsonConvert.DeserializeObject<DTSEmergencyTask>(obj.ToString());
-
if (emergencyTask == null) throw new Exception("鐏鍙傛暟涓虹┖");
-
string[] strings = emergencyTask.LocationCode.Split("-");
-
- string[] Roadways = strings[0].Select(x => x.ToString()).ToArray();
- string Roadway = string.Empty;
- switch (Roadways[0])
- {
- case "J":
- Roadway = "JZSC" + Roadways[1];
- break;
- case "G":
- Roadway = "GWSC" + Roadways[1];
- break;
- case "C":
- Roadway = "CWSC" + Roadways[1];
- break;
- default: throw new Exception("鏈瘑鍒簱浣嶇紪鐮�");
- }
-
+ string Roadway = strings[0];
+ //switch (Roadways[0])
+ //{
+ // case "J":
+ // Roadway = "JZSC" + Roadways[1];
+ // break;
+ // case "G":
+ // Roadway = "GWSC" + Roadways[1];
+ // break;
+ // case "C":
+ // Roadway = "CWSC" + Roadways[1];
+ // break;
+ // default: throw new Exception("鏈瘑鍒簱浣嶇紪鐮�");
+ //}
+ int Row = Convert.ToInt16(strings[1]);
+ int Column= Convert.ToInt16(strings[2]);
+ int Layer= Convert.ToInt16(strings[3]);
+ if (!strings[0].Contains("SC")) throw new Exception("鏈煡搴撳尯");
for (int i = 0; i < 2; i++)
{
- DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Convert.ToInt16(strings[1]) && x.Column == Convert.ToInt16(strings[2]) && x.Layer == (i == 0 ? Convert.ToInt16(strings[3]) * 2 - 1 : Convert.ToInt16(strings[3]) * 2) && x.RoadwayNo == Roadway);
+ DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Row && x.Column == Column && x.Layer == (i == 0 ? Layer - 1 : Layer) && x.RoadwayNo == Roadway);
if (locationInfo == null)
{
throw new Exception("鏈煡搴撲綅");
@@ -1236,16 +1319,19 @@
TaskType = task.TaskType,
};
+ List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
+ taskDTOs.Add(taskDTO);
+
var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
- var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSTask)?.ConfigValue;
+ var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveWMSTask)?.ConfigValue;
if (ReceiveByWMSTask == null || ipAddress == null)
{
throw new Exception("WMS IP 鏈厤缃�");
}
var wmsIpAddrss = ipAddress + ReceiveByWMSTask;
- var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTO));
+ var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTOs));
if (respon != null)
{
WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
@@ -1442,20 +1528,7 @@
var now = DateTime.Now;
var startOfDay = new DateTime(now.Year, now.Month, now.Day);
var endOfDay = startOfDay.AddDays(1);
- var filteredItems = _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Where(x => x.OutboundTime >= startOfDay && x.OutboundTime < endOfDay && x.IsFull)
- .Includes(x => x.StockInfoDetails)
- .ToList();
-
- var result = filteredItems
- .GroupBy(x => x.AreaCode)
- .Select(g => new GroupedStockInfo
- {
- AreaCode = g.Key,
- TotalQuantity = g.Sum(item => item.StockInfoDetails?.Count ?? 0),
- Items = g.ToList()
- })
- .ToList();
+ var result = _stockInfoRepository.Db.Queryable<DtStockInfo>().ToList();
return content.OK(data: result);
}
catch (Exception ex)
@@ -1517,4 +1590,160 @@
}
#endregion
+ public WebResponseContent GetTimeout()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var now = DateTime.Now;
+ // 浣跨敤Subtract鏂规硶
+ var threeHoursAgo = now.Subtract(TimeSpan.FromHours(3));
+
+ List<DtStockInfo> dtStocks = _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Where(x => x.OutboundTime < threeHoursAgo).ToList();
+ return content.OK1(total1:dtStocks.Count, data: dtStocks);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+
+ }
+ public WebResponseContent Getproductionstatistics()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var now = DateTime.Now;
+ var thirtyDaysAgo = now.AddDays(-30);
+ var roadwayMappings = new Dictionary<string, string> {
+ { "JZ", "闈欑疆搴�" },
+ { "CH", "闄堝寲搴�" },
+ { "FR", "鍒嗗搴�" },
+ { "GW", "楂樻俯搴�" },
+ { "CW", "甯告俯搴�" }
+};
+ var roadwayKeys = roadwayMappings.Keys.ToArray();
+ var taskTypes = new[] { 100, 104, 200, 204 };
+
+ var taskHty = _task_HtyRepository.Db.Queryable<Dt_Task_Hty>()
+ .Where(it =>
+ it.CreateDate >= thirtyDaysAgo &&
+ it.CreateDate <= now &&
+ taskTypes.Contains(it.TaskType) &&
+ roadwayKeys.Any(rk => it.Roadway.Contains(rk)))
+ .ToList()
+ .Select(t => new {
+ OriginalRoadway = t.Roadway,
+ RoadwayKey = roadwayKeys.FirstOrDefault(rk => t.Roadway.Contains(rk)),
+ TaskType = t.TaskType,
+ CreateDate = t.CreateDate
+ })
+ .Where(t => t.RoadwayKey != null)
+ .GroupBy(t => new {
+ RoadwayKey = t.RoadwayKey,
+ Date = t.CreateDate.Date,
+ Hour = t.CreateDate.Hour
+ })
+ .OrderByDescending(group => group.Key.Date)
+ .ThenByDescending(group => group.Key.Hour)
+ .Select(group => new TaskHourData
+ {
+ Hour = $"{group.Key.Date:yyyy/M/d} {(group.Key.Hour == 23 ? "23:00-24:00" : $"{group.Key.Hour}:00-{group.Key.Hour + 1}:00")}",
+ Roadway = roadwayMappings[group.Key.RoadwayKey],
+ TaskType100Count = group.Count(t => t.TaskType == 100),
+ TaskType104Count = group.Count(t => t.TaskType == 104),
+ TaskType200Count = group.Count(t => t.TaskType == 200),
+ TaskType204Count = group.Count(t => t.TaskType == 204)
+ })
+ .ToList();
+
+ // 鎸夋棩鏈熷拰搴撲綅鍒嗙粍锛屾壘鍑烘瘡澶╃殑鏈�鍚庝竴涓皬鏃�
+ var dailyLastHours = taskHty
+ .GroupBy(item => new {
+ Date = DateTime.Parse(item.Hour.Split(' ')[0]),
+ item.Roadway
+ })
+ .Select(group => new {
+ Date = group.Key.Date,
+ Roadway = group.Key.Roadway,
+ LastHour = group.Max(item => int.Parse(item.Hour.Split(' ')[1].Split(':')[0]))
+ })
+ .ToList();
+
+ // 鐢熸垚姹囨�绘暟鎹紙璋冩暣Hour鏍煎紡涓�"鏃ユ湡+鏃ユ眹鎬�"锛�
+ var summaryItems = dailyLastHours
+ .Select(dailyLastHour => {
+ // 鎵惧埌璇ユ棩鏈熻搴撲綅鐨勬墍鏈夊皬鏃舵暟鎹�
+ var dailyItems = taskHty
+ .Where(item =>
+ DateTime.Parse(item.Hour.Split(' ')[0]) == dailyLastHour.Date &&
+ item.Roadway == dailyLastHour.Roadway)
+ .ToList();
+
+ return new TaskHourData
+ {
+ Hour = $"{dailyLastHour.Date:yyyy/M/d}鏃ユ眹鎬�", // 淇敼Hour鏍煎紡
+ Roadway = dailyLastHour.Roadway,
+ TaskType100Count = dailyItems.Sum(item => item.TaskType100Count),
+ TaskType104Count = dailyItems.Sum(item => item.TaskType104Count),
+ TaskType200Count = dailyItems.Sum(item => item.TaskType200Count),
+ TaskType204Count = dailyItems.Sum(item => item.TaskType204Count),
+ IsSummary = true
+ };
+ })
+ .ToList();
+
+ // 灏嗘眹鎬绘暟鎹坊鍔犲埌缁撴灉涓�
+ taskHty = taskHty.Concat(summaryItems).ToList();
+
+ // 璋冩暣鎺掑簭閫昏緫锛氬厛鎸夋棩鏈熼檷搴忥紝鍐嶆寜鏄惁姹囨�伙紙姹囨�诲湪鍓嶏級锛屾渶鍚庢寜灏忔椂闄嶅簭
+ taskHty = taskHty
+ .OrderByDescending(item => {
+ var datePart = item.Hour.Contains("鏃ユ眹鎬�")
+ ? item.Hour.Split("鏃ユ眹鎬�")[0]
+ : item.Hour.Split(' ')[0];
+ return DateTime.Parse(datePart);
+ })
+ .ThenByDescending(item => item.IsSummary) // 姹囨�绘暟鎹帓鍦ㄥ墠闈�
+ .ThenByDescending(item => {
+ if (!item.IsSummary && item.Hour.Contains(' '))
+ {
+ return int.Parse(item.Hour.Split(' ')[1].Split(':')[0]);
+ }
+ return 0;
+ })
+ .ToList();
+ return content.OK1(total1: taskHty.Count, data: taskHty);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ public WebResponseContent GetLocationStatus()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ List<DtLocationInfo> LocationList = _locationRepository.Db.Queryable<DtLocationInfo>().Where(x => x.LocationStatus != 2 && x.LocationStatus != 0).ToList();
+ return content.OK1(total1: LocationList.Count, data: LocationList);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+
+ }
+}
+
+internal class TaskHourData
+{
+ public string Hour { get; set; }
+ public string Roadway { get; set; }
+ public int TaskType100Count { get; set; }
+ public int TaskType104Count { get; set; }
+ public int TaskType200Count { get; set; }
+ public int TaskType204Count { get; set; }
+ public bool IsSummary { get; set; } = false;
}
\ No newline at end of file
--
Gitblit v1.9.3