From 85fd548c3948b4ded198f304204e9ce602761edc Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期一, 10 三月 2025 08:36:21 +0800
Subject: [PATCH] 修复日志输出和更正创建者名称
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 322 +++++++++++++++++++++++++++++------------------------
1 files changed, 178 insertions(+), 144 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 6d021a8..7480428 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1,5 +1,6 @@
锘縰sing Mapster;
using Masuit.Tools;
+using NewLife.Log;
using SqlSugar;
using System.Text.RegularExpressions;
using WIDESEA_Cache;
@@ -112,12 +113,12 @@
ConsoleHelper.WriteErrorLine("MOM閫氭姤鐐硅姱NG");
return content.Error("MOM閫氭姤鐐硅姱NG");
}
-
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
var taskHty = task.Adapt<Dt_Task_Hty>();
taskHty.FinishTime = DateTime.Now;
- taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
stockInfo_Hty.ModifyDate = DateTime.Now;
@@ -137,18 +138,17 @@
});
try
{
- using(_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))
- {
- _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
- }
+ //using (_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))
+ //{
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
+ //}
}
catch (Exception ex)
{
LogFactory.GetLog("鍒犻櫎缂撳瓨澶辫触").Error(true, $"{stock.PalletCode}_鍒犻櫎缂撳瓨澶辫触锛屽紓甯镐俊鎭細{ex.Message}");
- using(_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))
- {
- _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
- }
+ //using (_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))
+ //{
+ //}
}
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
@@ -386,9 +386,16 @@
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
stock.StockInfoDetails = new List<DtStockInfoDetail>() { { stock.StockInfoDetails[0] } };
- using(_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))
+ stock.LocationInfo = locationInf;
+ //using(_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))
+ //{
+ try
{
_simpleCacheService.HashAdd(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, stock.PalletCode, stock);
+ }
+ catch (Exception ex)
+ {
+ LogFactory.GetLog("娣诲姞缂撳瓨澶辫触").Error(true, $"{stock.PalletCode}_娣诲姞缂撳瓨澶辫触锛屽紓甯镐俊鎭細{ex.Message}");
}
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
@@ -539,9 +546,9 @@
{
isFull = respone.SpecialParameterDuration.IsNullOrEmpty();
}
- if (respone.ProductionLine == null || respone.ParameterInfos == null)
+ if (respone.ProductionLine == null || respone.ParameterInfos == null|| respone.ParameterInfos.IsNullOrEmpty())
{
- throw new Exception("MOM鏁版嵁杩斿洖閿欒");
+ throw new Exception($"MOM鏁版嵁杩斿洖閿欒,浜х嚎{respone.ProductionLine},ParameterInfos{respone.ParameterInfos}");
}
stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
stock.SpecialParameterDuration = respone.SpecialParameterDuration;
@@ -1023,18 +1030,6 @@
{
// 鍒涘缓WMS浠诲姟
WMSTaskDTO taskDTO = CreateTaskDTO(task);
- //WMSTaskDTO taskDTO = new WMSTaskDTO()
- //{
- // TaskNum = task.TaskNum.Value,
- // Grade = 1,
- // PalletCode = task.PalletCode,
- // RoadWay = task.Roadway,
- // SourceAddress = task.SourceAddress,
- // TargetAddress = task.Roadway,
- // TaskState = task.TaskState.Value,
- // Id = 0,
- // TaskType = task.TaskType,
- //};
return content.OK(data: task);
}
@@ -1182,7 +1177,7 @@
{
// 璁板綍寮傚父淇℃伅骞舵姏鍑�
LogFactory.GetLog("璇锋眰鎵樼洏浠诲姟").Error(true, ex);
- ConsoleHelper.WriteErrorLine("璇锋眰绌�/瀹炴墭鐩樹换鍔�" + ex.Message);
+ ConsoleHelper.WriteErrorLine("璇锋眰绌�/瀹炴墭鐩樹换鍔�" + ex.Message + "\r\n" + ex.StackTrace);
return content.Error(ex.Message);
}
}
@@ -1192,39 +1187,52 @@
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> devices, string productionLine)
{
- var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
- if (area == null)
+ try
{
- ConsoleHelper.WriteErrorLine($"鏌ヨ瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{areaCode}鐨勬暟鎹�");
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+ if (area == null)
+ {
+ ConsoleHelper.WriteErrorLine($"鏌ヨ瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{areaCode}鐨勬暟鎹�");
+ return null;
+ }
+
+ var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ List<string>? materielCodes = outBoundMateriel.Count != 0
+ ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == area.AreaCode)
+ .Select(x => x.MaterielCode)
+ .ToList()
+ : null;
+
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+ var result = new DtStockInfo();
+
+ //if (stockInfoList.IsNullOrEmpty())
+ //{
+ // stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ // .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).IncludesAllFirstLayer().ToListAsync();
+ //}
+
+ result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)
+ .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
+ .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
+ .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
+ .OrderBy(x => x.OutboundTime)
+ .FirstOrDefault();
+
+ if (result != null)
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
+ else
+ ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayAsync鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:鏈壘鍒扮鍚堟潯浠剁殑鏁版嵁");
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayAsync鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:" + ex.Message + "\r\n" + ex.StackTrace);
return null;
}
-
- var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
- List<string>? materielCodes = outBoundMateriel.Count != 0
- ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == area.AreaCode)
- .Select(x => x.MaterielCode)
- .ToList()
- : null;
-
- IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
- List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
- var result = new DtStockInfo();
-
- //if (stockInfoList.IsNullOrEmpty())
- //{
- // stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- // .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).IncludesAllFirstLayer().ToListAsync();
- //}
-
- result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)
- .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
- .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
- .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
- .OrderBy(x => x.OutboundTime)
- .FirstOrDefault();
-
- return result;
}
/// <summary>
@@ -1232,45 +1240,62 @@
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForRealTrayCWAsync(List<string> areaCodes, string productionLine)
{
- var areaId = (await _areaInfoRepository.QueryDataAsync(x => areaCodes.Contains(x.AreaCode))).Select(x => x.AreaID).ToList();
- if (areaId.Count == 0)
+ try
{
- ConsoleHelper.WriteErrorLine($"鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{JsonConvert.SerializeObject(areaCodes)}鐨勬暟鎹�");
+ var areaId = (await _areaInfoRepository.QueryDataAsync(x => areaCodes.Contains(x.AreaCode))).Select(x => x.AreaID).ToList();
+ if (areaId.Count == 0)
+ {
+ ConsoleHelper.WriteErrorLine($"鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{JsonConvert.SerializeObject(areaCodes)}鐨勬暟鎹�");
+ return null;
+ }
+
+ //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ //List<string> materielCodes = null;
+ //if (outBoundMateriel.Count != 0)
+ //{
+ // materielCodes = outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0]).Select(x => x.MaterielCode).ToList();
+ //}
+
+ var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ List<string>? materielCodes = outBoundMateriel.Count != 0
+ ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0])
+ .Select(x => x.MaterielCode)
+ .ToList()
+ : null;
+
+ 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 deviceCode = devices.Select(x => x.DeviceCode).ToList();
+
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+
+ var result = stockInfoList.Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+ .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
+ .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && areaId.Contains(x.LocationInfo.AreaId) && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
+ .OrderBy(x => x.OutboundTime) // 鎺掑簭
+ .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
+
+ if (result != null)
+ {
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayCWAsync鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅澶辫触:鏈壘鍒扮鍚堟潯浠剁殑鏁版嵁");
+ }
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayCWAsync鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:" + ex.Message + "\r\n" + ex.StackTrace);
return null;
}
-
- //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
- //List<string> materielCodes = null;
- //if (outBoundMateriel.Count != 0)
- //{
- // materielCodes = outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0]).Select(x => x.MaterielCode).ToList();
- //}
-
- var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
- List<string>? materielCodes = outBoundMateriel.Count != 0
- ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0])
- .Select(x => x.MaterielCode)
- .ToList()
- : null;
-
- 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 deviceCode = devices.Select(x => x.DeviceCode).ToList();
-
- IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
- List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
-
- var result = stockInfoList.Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
- .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && areaId.Contains(x.LocationInfo.AreaId) && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .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) // 鎺掑簭
- .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
-
- return result;
}
/// <summary>
@@ -1278,37 +1303,44 @@
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, string position)
{
- var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+ try
+ {
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
- ConsoleHelper.WriteColorLine(position + "..." + areaCode, ConsoleColor.Magenta);
- var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == position && x.stationType == 17);
+ ConsoleHelper.WriteColorLine(position + "..." + areaCode, ConsoleColor.Magenta);
+ var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == position && x.stationType == 17);
- ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
- var stackers = station.Roadway.Split(',').ToList();
+ ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
+ var stackers = station.Roadway.Split(',').ToList();
- var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
- .Where(x => x.DeviceStatus == "1")
- .Where(x => stackers.Contains(x.DeviceCode))
- .ToList().Select(x => x.DeviceCode).ToList();
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => stackers.Contains(x.DeviceCode))
+ .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 == station.productLine)
- .Where(x => x.AreaCode == areaCode && x.IsFull == false)
- .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
- .OrderBy(x => x.CreateDate) // 鎺掑簭
- .FirstOrDefault(); // 杞崲涓哄垪琛�
+ var result = stockInfoList.Where(x => x.ProductionLine == station.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 => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .OrderBy(x => x.CreateDate) // 鎺掑簭
+ .FirstOrDefault(); // 杞崲涓哄垪琛�
- //if (result != null)
- //{
- // stockInfoList = stockInfoList.Where(x => x != result).ToList();
- // _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
- //}
+ if (result != null)
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
+ else
+ ConsoleHelper.WriteErrorLine("QueryStockInfoForEmptyTrayAsync鏌ヨ绌虹洏搴撳瓨淇℃伅澶辫触:鏈壘鍒扮鍚堟潯浠剁殑鏁版嵁");
- return result;
+ return result;
+ }
+ catch (Exception ex)
+ {
+ ConsoleHelper.WriteErrorLine("QueryStockInfoForEmptyTrayAsync鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:" + ex.Message + "\r\n" + ex.StackTrace);
+ return null;
+ }
}
/// <summary>
@@ -1704,7 +1736,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.Inbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -1742,7 +1774,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -2010,7 +2042,7 @@
var taskHty = _mapper.Map<Dt_Task_Hty>(task);
taskHty.FinishTime = DateTime.Now;
taskHty.TaskId = 0;
- taskHty.OperateType = isHand ? (int)OperateTypeEnum.浜哄伐鍒犻櫎 : (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.OperateType = isHand ? (int)OperateTypeEnum.浜哄伐鍒犻櫎 : App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.SourceId = task.TaskId;
if (isHand)
{
@@ -2072,32 +2104,34 @@
}
}
- if (stock.IsFull)
- {
- // 鏌ヨ绗﹀悎鏉′欢鐨勫簱瀛樹俊鎭�
- var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
+ #region 鏇存柊搴撳瓨淇℃伅锛堟殏鏃朵笉闇�瑕侊級
+ //if (stock.IsFull)
+ //{
+ // // 鏌ヨ绗﹀悎鏉′欢鐨勫簱瀛樹俊鎭�
+ // var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
- // 鏌ヨ浠诲姟淇℃伅
- var tasks = BaseDal.QueryData(x => x.PalletCode != stock.PalletCode && x.ProductionLine == stock.ProductionLine).Select(x => x.PalletCode).ToList();
+ // // 鏌ヨ浠诲姟淇℃伅
+ // var tasks = BaseDal.QueryData(x => x.PalletCode != stock.PalletCode && x.ProductionLine == stock.ProductionLine).Select(x => x.PalletCode).ToList();
- if (stocks != null && stocks.Count > 0)
- {
- // 杩囨护鍑洪渶瑕佹洿鏂扮殑搴撳瓨淇℃伅
- var stocksToUpdate = stocks.Where(item => !tasks.Contains(item.PalletCode)).ToList();
- foreach (var item in stocksToUpdate)
- {
- // 鏇存柊搴撳瓨淇℃伅鐨勭壒瀹氬弬鏁�
- item.SpecialParameterDuration = stock.SpecialParameterDuration;
- item.ParameterInfos = stock.ParameterInfos;
- item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
- }
- if (stocksToUpdate.Count > 0)
- {
- // 寮傛鏇存柊搴撳瓨淇℃伅
- var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocksToUpdate);
- }
- }
- }
+ // if (stocks != null && stocks.Count > 0)
+ // {
+ // // 杩囨护鍑洪渶瑕佹洿鏂扮殑搴撳瓨淇℃伅
+ // var stocksToUpdate = stocks.Where(item => !tasks.Contains(item.PalletCode)).ToList();
+ // foreach (var item in stocksToUpdate)
+ // {
+ // // 鏇存柊搴撳瓨淇℃伅鐨勭壒瀹氬弬鏁�
+ // item.SpecialParameterDuration = stock.SpecialParameterDuration;
+ // item.ParameterInfos = stock.ParameterInfos;
+ // item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
+ // }
+ // if (stocksToUpdate.Count > 0)
+ // {
+ // // 寮傛鏇存柊搴撳瓨淇℃伅
+ // var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocksToUpdate);
+ // }
+ // }
+ //}
+ #endregion
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
@@ -2288,7 +2322,7 @@
TaskState = flag == 3 ? (int)TaskOutStatusEnum.OutNew : (int)TaskInStatusEnum.InNew,
TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = productionLine,
ProcessCode = processCode
};
--
Gitblit v1.9.3