From 867793e0bd4d8e84b8ae98e31d5d722fdb73cee9 Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@hnkhzn.com>
Date: 星期三, 18 六月 2025 19:15:59 +0800
Subject: [PATCH] 更新生产统计，修改大屏库存数据展示
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 722 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 540 insertions(+), 182 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 6714028..19282f0 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,8 +1,6 @@
锘縰sing Masuit.Tools;
using SqlSugar;
using WIDESEA_Common.CustomModels;
-
-//using WIDESEA_Common.CustomModels;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
@@ -200,7 +198,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -227,7 +225,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System"
};
return taskNG;
}
@@ -239,38 +237,38 @@
}
// 澶勭悊寮傚父鐢佃姱鎯呭喌
- var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
- if (serialNosError.Count > 0)
- {
- if (stationManager.stationType != 3)
- {
- var taskNG = new Dt_Task
- {
- CurrentAddress = input.Position,
- Grade = 1,
- Roadway = input.Roadways,
- TargetAddress = stationManager.stationNGLocation,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = stationManager.stationNGChildCode,
- OrderNo = null,
- PalletCode = input.PalletCode,
- SourceAddress = stationManager.stationLocation,
- TaskState = (int)TaskInStatusEnum.Line_InFinish,
- TaskType = (int)TaskOutboundTypeEnum.InToOut,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
- ProductionLine = result.ProductionLine,
- ProcessCode = result.ProcessCode,
- };
- return taskNG;
- }
- else
- {
- Console.WriteLine($"绔欏彴{stationManager.stationChildCode}MOM杩斿洖鐢佃姱寮傚父:{result.MOMMessage}");
- return null;
- }
- }
+ //var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
+ //if (serialNosError.Count > 0)
+ //{
+ // if (stationManager.stationType != 3)
+ // {
+ // var taskNG = new Dt_Task
+ // {
+ // CurrentAddress = input.Position,
+ // Grade = 1,
+ // Roadway = input.Roadways,
+ // TargetAddress = stationManager.stationNGLocation,
+ // Dispatchertime = DateTime.Now,
+ // MaterialNo = "",
+ // NextAddress = stationManager.stationNGChildCode,
+ // OrderNo = null,
+ // PalletCode = input.PalletCode,
+ // SourceAddress = stationManager.stationLocation,
+ // TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ // TaskType = (int)TaskOutboundTypeEnum.InToOut,
+ // TaskNum = await BaseDal.GetTaskNo(),
+ // Creater = "System",
+ // ProductionLine = result.ProductionLine,
+ // ProcessCode = result.ProcessCode,
+ // };
+ // return taskNG;
+ // }
+ // else
+ // {
+ // Console.WriteLine($"绔欏彴{stationManager.stationChildCode}MOM杩斿洖鐢佃姱寮傚父:{result.MOMMessage}");
+ // return null;
+ // }
+ //}
//else
//{
// throw new Exception($"绔欏彴{stationManager.stationChildCode}MOM杩斿洖鐢佃姱寮傚父:{result.MOMMessage}");
@@ -293,7 +291,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -371,7 +369,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -421,7 +419,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = stationManager.stationType == 1 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -460,7 +458,7 @@
else
{
locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Distribute && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
- if (locations == null)
+ if (locations.IsNullOrEmpty())
{
locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
}
@@ -543,12 +541,17 @@
if (stationManager.stationType != 7) throw new Exception("閿欒鐨勮皟鍙�");
// 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
- IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
- List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+ //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
- var stockinfo = stockInfoList.Where(x => x.LocationInfo != null && !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway)
- .OrderBy(x => x.CreateDate)
- .FirstOrDefault();
+ //var stockinfo1 = stockInfoList.OrderBy(x => x.CreateDate)
+ // .ToList();
+ //var stockinfo = stockinfo1.Where(x => x.LocationInfo != null && !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway)
+ // .FirstOrDefault();
+ var stockinfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Where(x => !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway)
+ .OrderBy(x=>x.CreateDate)
+ .FirstAsync();
if (stockinfo == null) return null;
@@ -567,10 +570,10 @@
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = (int)TaskOutboundTypeEnum.OutTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = stockinfo.ProductionLine,
};
-
+ //_simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { task.PalletCode });
return task;
}
catch (Exception ex)
@@ -662,7 +665,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -724,7 +727,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.Inbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -894,26 +897,26 @@
WebResponseContent content = new WebResponseContent();
try
{
- string requestKey = JsonConvert.SerializeObject(taskDTO);
- // 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
- if (requestTrackerToCW.TryGetValue(requestKey, out var requestInfo))
- {
- if (requestInfo.Count > 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(2))
- {
- // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
- throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
- }
- }
+ //string requestKey = JsonConvert.SerializeObject(taskDTO);
+ //// 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
+ //if (requestTrackerToCW.TryGetValue(requestKey, out var requestInfo))
+ //{
+ // if (requestInfo.Count > 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(2))
+ // {
+ // // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
+ // throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
+ // }
+ //}
- // 鏇存柊璇锋眰璺熻釜淇℃伅
- if (requestTrackerToCW.ContainsKey(requestKey))
- {
- requestTrackerToCW[requestKey] = (requestInfo.Count + 1, DateTime.Now);
- }
- else
- {
- requestTrackerToCW[requestKey] = (1, DateTime.Now);
- }
+ //// 鏇存柊璇锋眰璺熻釜淇℃伅
+ //if (requestTrackerToCW.ContainsKey(requestKey))
+ //{
+ // requestTrackerToCW[requestKey] = (requestInfo.Count + 1, DateTime.Now);
+ //}
+ //else
+ //{
+ // requestTrackerToCW[requestKey] = (1, DateTime.Now);
+ //}
var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position && x.stationStatus == "1");
var locations = _locationRepository.QueryData(x => x.RoadwayNo == station.Roadway && x.LocationStatus == (int)LocationEnum.Free && x.LocationType == 1);
@@ -947,7 +950,7 @@
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
// 杩斿洖鎴愬姛鍝嶅簲
- requestTrackerToCW.Remove(requestKey);
+ //requestTrackerToCW.Remove(requestKey);
return content.OK(data: wmsTask);
}
@@ -981,16 +984,36 @@
.ToList().Select(x => x.DeviceCode).ToList();
// 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
- IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
- List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+ //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
- var result = stockInfoList.Where(x => x.ProductionLine == productLine)
- .Where(x => x.AreaCode == areaCode && x.IsFull == false)
- .Where(x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
- .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))
- .OrderBy(x => x.CreateDate) // 鎺掑簭
- .FirstOrDefault(); // 杞崲涓哄垪琛�
+ //var result1 = stockInfoList.Where(x => x.ProductionLine == productLine)
+ // .Where(x => x.AreaCode == areaCode && x.IsFull == false)
+ // .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ // .OrderBy(x => x.CreateDate) // 鎺掑簭
+ // .ToList(); // 杞崲涓哄垪琛�
+
+ //var result = result1.Where(x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
+ // .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+ // .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
+
+ //if (result != null)
+ // _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
+ //else
+ // ConsoleHelper.WriteColorLine($"甯告俯{productLine}绌烘墭鐩樺簱瀛樹笉瓒�", ConsoleColor.Red);
+ var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo)
+ .Includes(x => x.StockInfoDetails)
+ .Where(x => x.AreaCode == areaCode && x.IsFull == false && x.ProductionLine == productLine)
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+ .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
+ .OrderBy(x => x.CreateDate) // 鎺掑簭
+ .FirstAsync();
+
+ if (result.IsNullOrEmpty())
+ ConsoleHelper.WriteColorLine($"甯告俯{productLine}绌烘墭鐩樺簱瀛樹笉瓒�", ConsoleColor.Red);
+
return result;
}
@@ -1020,20 +1043,48 @@
.Where(x => x.DeviceCode.Contains("CWSC")) // 杩囨护鏉′欢
.ToList().Select(x => x.DeviceCode).ToList();
- // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
- IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
- List<DtStockInfo> stockInfoList = stockInfos.Values.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;
+ #region
+ //// 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
+ //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+
+ //// 淇敼鍚庣殑鏌ヨ浠ｇ爜
+ //var stockInfo1 = stockInfoList
+ // .Where(x => x.ProductionLine == station.productLine)
+ // .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true)
+ // .OrderBy(x => x.OutboundTime)
+ // .ToList();
+
+ //var stockInfo = stockInfo1
+ // // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
+ // .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)
+ // // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
+ // .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ // .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
+ // .FirstOrDefault();
// 淇敼鍚庣殑鏌ヨ浠ｇ爜
- var stockInfo = stockInfoList
- .Where(x => x.ProductionLine == station.productLine)
- .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true)
- // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
- .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)
- // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
- .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))
- .OrderBy(x => x.OutboundTime)
- .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();
+
if (stockInfo == null) throw new Exception($"搴撳唴{station.productLine}鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�");
@@ -1057,7 +1108,7 @@
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = (int)TaskOutboundTypeEnum.Outbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = stockInfo.ProductionLine,
ProcessCode = stockInfo.ProcessCode,
};
@@ -1069,6 +1120,8 @@
BaseDal.AddData(task);
stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
_locationRepository.UpdateData(stockInfo.LocationInfo);
+
+ //_simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode });
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(stockInfo.LocationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
@@ -1085,110 +1138,132 @@
#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("鐏鍙傛暟涓虹┖");
-
- DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == emergencyTask.row && x.Column == emergencyTask.column && x.Layer == emergencyTask.layer && x.AreaId == emergencyTask.zone);
- if (locationInfo == null)
+ string[] strings = emergencyTask.LocationCode.Split("-");
+ 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++)
{
- throw new Exception("鏈煡搴撲綅");
- }
-
- //鏌ユ壘娑堥槻绔欏彴
- var station = _stationManagerRepository.QueryFirst(t => t.Roadway == locationInfo.RoadwayNo
- && t.stationType == (int)StationManager.FireStation
- /*&& t. == "Enable"*/);
- if (station == null)
- {
- throw new Exception("娑堥槻绔欏彴鏈厤缃�!");
- }
-
- //鏌ユ壘搴撳瓨淇℃伅
- var stockInfo = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode && x.LocationInfo.RoadwayNo == locationInfo.RoadwayNo);
- //鎵樼洏鐮�
- string barcode = string.Empty;
- if (stockInfo != null)
- {
- barcode = stockInfo.PalletCode;
- }
- else
- {
- //鏃犲簱瀛樹俊鎭紝鐢熸垚闅忔満鎵樼洏鐮�
- barcode = "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000);
- }
-
- Dt_Task fireTask = BaseDal.QueryFirst(x => x.TaskType == 500 && x.SourceAddress == locationInfo.LocationCode && x.Roadway == station.Roadway);
-
- if (fireTask != null)
- {
- throw new Exception("宸叉坊鍔犵伀璀﹀嚭搴撲换鍔�");
- }
-
- int taskNum = BaseDal.GetTaskNo().Result;
- Dt_Task task = new Dt_Task
- {
- CreateDate = DateTime.Now,
- Creater = "DTS",
- CurrentAddress = locationInfo.LocationCode,
- Grade = 1,
- Dispatchertime = DateTime.Now,
- PalletCode = barcode,
- Roadway = station.Roadway,
- SourceAddress = locationInfo.LocationCode,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = 500,
- TargetAddress = station.stationLocation,
- NextAddress = station.stationChildCode,
- TaskNum = taskNum, //_taskRepository.GetTaskNo().Result,
- TaskId = 0,
- };
-
- // 灏濊瘯娣诲姞鏂颁换鍔�
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TaskNum = task.TaskNum.Value,
- Grade = 1,
- PalletCode = task.PalletCode,
- RoadWay = task.Roadway,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.TargetAddress,
- TaskState = task.TaskState.Value,
- Id = 0,
- TaskType = 500,
- };
-
- 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;
- if (ReceiveByWMSTask == null || ipAddress == null)
- {
- throw new Exception("WMS IP 鏈厤缃�");
- }
- var wmsIpAddrss = ipAddress + ReceiveByWMSTask;
-
- var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTO));
- if (respon != null)
- {
- WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
- if (respone.Status)
+ DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Row && x.Column == Column && x.Layer == (i == 0 ? Layer - 1 : Layer) && x.RoadwayNo == Roadway);
+ if (locationInfo == null)
{
- var taskId = BaseDal.AddData(task);
+ throw new Exception("鏈煡搴撲綅");
+ }
+
+ //鏌ユ壘娑堥槻绔欏彴
+ var station = _stationManagerRepository.QueryFirst(t => t.Roadway == locationInfo.RoadwayNo && t.stationType == (int)StationManager.FireStation);
+ if (station == null)
+ {
+ throw new Exception("娑堥槻绔欏彴鏈厤缃�!");
+ }
+
+ //鏌ユ壘搴撳瓨淇℃伅
+ var stockInfo = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode && x.LocationInfo.RoadwayNo == locationInfo.RoadwayNo);
+ //鎵樼洏鐮�
+ string barcode = string.Empty;
+ if (stockInfo != null)
+ {
+ barcode = stockInfo.PalletCode;
}
else
{
- throw new Exception("WCS澶勭悊澶辫触:" + respone.Message);
+ //鏃犲簱瀛樹俊鎭紝鐢熸垚闅忔満鎵樼洏鐮�
+ barcode = "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000);
}
- }
- else
- {
- throw new Exception("璇锋眰澶勭悊澶辫触");
+
+ Dt_Task fireTask = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.OutFireAlarm && x.SourceAddress == locationInfo.LocationCode && x.Roadway == station.Roadway);
+
+ if (fireTask != null)
+ {
+ throw new Exception("宸叉坊鍔犵伀璀﹀嚭搴撲换鍔�");
+ }
+
+ int taskNum = BaseDal.GetTaskNo().Result;
+ Dt_Task task = new Dt_Task
+ {
+ CreateDate = DateTime.Now,
+ Creater = "DTS",
+ CurrentAddress = locationInfo.LocationCode,
+ Grade = i == 0 ? 5 : 3,
+ Dispatchertime = DateTime.Now,
+ PalletCode = barcode,
+ Roadway = station.Roadway,
+ SourceAddress = locationInfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.OutFireAlarm,
+ TargetAddress = station.stationLocation,
+ NextAddress = station.stationLocation,
+ TaskNum = taskNum, //_taskRepository.GetTaskNo().Result,
+ TaskId = 0,
+ };
+
+ // 灏濊瘯娣诲姞鏂颁换鍔�
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.TargetAddress,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ 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.ReceiveWMSTask)?.ConfigValue;
+ if (ReceiveByWMSTask == null || ipAddress == null)
+ {
+ throw new Exception("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = ipAddress + ReceiveByWMSTask;
+
+ var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTOs));
+ if (respon != null)
+ {
+ WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
+ if (respone.Status)
+ {
+ var taskId = BaseDal.AddData(task);
+ }
+ else
+ {
+ throw new Exception("WCS澶勭悊澶辫触:" + respone.Message);
+ }
+ }
+ else
+ {
+ throw new Exception("璇锋眰澶勭悊澶辫触");
+ }
}
LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, $"\r\r--------------------------------------");
LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, obj.ToJsonString());
@@ -1288,6 +1363,289 @@
}
return content;
}
+ /// <summary>
+ /// 鑾峰彇浠诲姟绫诲瀷鎻忚堪鏂规硶
+ /// </summary>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ private string GetTaskTypeDesc(int taskType)
+ {
+ return taskType switch
+ {
+ (int)TaskInboundTypeEnum.Inbound => TaskInboundTypeEnum.Inbound.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskInboundTypeEnum.InTray => TaskInboundTypeEnum.InTray.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskInboundTypeEnum.InNG => TaskInboundTypeEnum.InNG.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskInboundTypeEnum.InQuality => TaskInboundTypeEnum.InQuality.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutboundTypeEnum.OutTray => TaskOutboundTypeEnum.OutTray.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutboundTypeEnum.Outbound => TaskOutboundTypeEnum.Outbound.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutboundTypeEnum.OutNG => TaskOutboundTypeEnum.OutNG.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutboundTypeEnum.InToOut=> TaskOutboundTypeEnum.InToOut.GetIntegralRuleTypeEnumDesc(),
+ };
+ }
#endregion
+
+ #region 澶у睆鎺ュ彛
+
+ /// <summary>
+ /// 鑾峰彇浠诲姟淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent GetTaskInfo()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = BaseDal.QueryData(x => true).ToList();
+ var newTask = task.Select(x => new
+ {
+ x.PalletCode,
+ x.Roadway,
+ x.SourceAddress,
+ x.TargetAddress,
+ x.ProductionLine,
+ TaskType = new List<string> { GetTaskTypeDesc(x.TaskType) }[0], // 姣忎釜浠诲姟鐙珛鐢熸垚 TaskType
+ TaskState = new List<string> { GetTaskStateDesc(x.TaskState) }[0] // 姣忎釜浠诲姟鐙珛鐢熸垚 TaskState
+ }).ToList();
+
+ return content.OK(data: newTask);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ // 瀹氫箟鑾峰彇浠诲姟鐘舵�佹弿杩版柟娉�
+ private string GetTaskStateDesc(int? taskState)
+ {
+ return taskState switch
+ {
+ (int)TaskInStatusEnum.InNew => TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskInStatusEnum.Line_InExecuting => TaskInStatusEnum.Line_InExecuting.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskInStatusEnum.Line_InFinish => TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskInStatusEnum.SC_InExecuting => TaskInStatusEnum.SC_InExecuting.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskInStatusEnum.SC_InFinish => TaskInStatusEnum.SC_InFinish.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutStatusEnum.OutNew => TaskOutStatusEnum.OutNew.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutStatusEnum.SC_OutExecuting => TaskOutStatusEnum.SC_OutExecuting.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutStatusEnum.SC_OutFinish => TaskOutStatusEnum.SC_OutFinish.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutStatusEnum.Line_OutExecuting => TaskOutStatusEnum.Line_OutExecuting.GetIntegralRuleTypeEnumDesc(),
+ (int)TaskOutStatusEnum.Line_OutFinish => TaskOutStatusEnum.Line_OutFinish.GetIntegralRuleTypeEnumDesc(),
+ };
+ }
+ /// <summary>
+ /// 鑾峰彇搴撳瓨淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent GetStockInfo()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var now = DateTime.Now;
+ var startOfDay = new DateTime(now.Year, now.Month, now.Day);
+ var endOfDay = startOfDay.AddDays(1);
+ var result = _stockInfoRepository.Db.Queryable<DtStockInfo>().ToList();
+ return content.OK(data: result);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鑾峰彇璐т綅鐘舵��
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent GetStockQuantity()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var location = _locationRepository.Db.Queryable<DtLocationInfo>().ToList();
+
+ return content.OK(data: location);
+
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ public WebResponseContent Getproductionvolume()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var now = DateTime.Now;
+ var startOfDay = new DateTime(now.Year, now.Month, now.Day);
+ var endOfDay1 = startOfDay.AddDays(-7);
+ var taskHty = _task_HtyRepository.Db.Queryable<Dt_Task_Hty>().Where(it => it.CreateDate > endOfDay1).ToList();
+ return content.OK(data: taskHty);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+
+ }
+
+ public WebResponseContent Getoutput()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var now = DateTime.Now;
+ var firstDayOfYear = new DateTime(now.Year, 1, 1);
+ var taskHty = _task_HtyRepository.Db.Queryable<Dt_Task_Hty>().Where(it => it.CreateDate > firstDayOfYear && it.TaskType == 100).ToList();
+ return content.OK(data: taskHty);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+
+ }
+ #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);
+ }
+ }
+}
+
+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