From a833526d6f9d396df0249066f8057c6d5c51b86d Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期四, 27 二月 2025 13:36:26 +0800
Subject: [PATCH] 修复 Dt_TaskService.cs 中 locations 检查逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 164 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 138 insertions(+), 26 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 7e35a13..b95bab5 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,18 +1,10 @@
-锘縰sing Castle.Components.DictionaryAdapter.Xml;
-using log4net.Core;
-using Masuit.Tools;
-using System.CodeDom;
-using System.Threading.Tasks;
-using WIDESEA_Common;
+锘縰sing Masuit.Tools;
using WIDESEA_Common.CustomModels;
//using WIDESEA_Common.CustomModels;
-using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
-using WIDESEA_StorageTaskRepository;
-using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;
@@ -123,7 +115,6 @@
{
throw new Exception(ex.Message);
}
-
}
/// <summary>
@@ -209,7 +200,8 @@
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = result.ProductionLine
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return taskNG;
}
@@ -267,7 +259,8 @@
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = result.ProductionLine
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return taskNG;
}
@@ -300,7 +293,8 @@
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = result.ProductionLine
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return task;
}
@@ -377,7 +371,8 @@
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = result.ProductionLine
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return taskNG;
}
@@ -407,7 +402,7 @@
////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
////var processResponse = await GetProcessResponseAsync(process, input.Position);
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
- #endregion
+ #endregion 鍏ュ簱浠诲姟
}
var task = new Dt_Task
@@ -427,6 +422,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
int lastStatus = locationInfo.LocationStatus;
ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + lastStatus.ToString());
@@ -439,11 +435,12 @@
return task;
}
- #endregion 鍏ュ簱浠诲姟
+ #endregion 璇锋眰浠诲姟鍏ュ簱
#region 搴撲綅鍒嗛厤
#region 鑾峰彇璐т綅
+
/// <summary>
///
/// </summary>
@@ -462,6 +459,10 @@
else
{
locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Distribute && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ if (locations == null)
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ }
}
if (locations == null)
@@ -477,9 +478,11 @@
return null;
}
}
+
#endregion 鑾峰彇璐т綅
#region 寮傚父鍙ｅ叆搴撹幏鍙栧簱浣�
+
private async Task<DtLocationInfo> RequestLocationByAbnormal(RequestTaskDto requestTask, bool isCheckRequest = false)
{
try
@@ -507,7 +510,8 @@
return null;
}
}
- #endregion
+
+ #endregion 寮傚父鍙ｅ叆搴撹幏鍙栧簱浣�
#endregion 搴撲綅鍒嗛厤
@@ -530,6 +534,7 @@
#endregion 璇锋眰浠诲姟鍏ュ簱
#region 鍒涘缓绌烘鍑哄簱浠诲姟
+
public async Task<Dt_Task> CreateEmptyOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
{
try
@@ -571,6 +576,7 @@
throw new Exception(ex.Message);
}
}
+
#endregion
#region 鐩存帴鍑哄簱浠诲姟瀹屾垚
@@ -594,11 +600,13 @@
return content.Error(ex.Message);
}
}
+
#endregion
#region 寮傚父鍙ｄ换鍔℃娴�
+
/// <summary>
- /// 寮傚父鎺掑嚭鍙ｅ叆搴撴牎楠� 鎵�鏈夊紓甯镐氦缁橶CS鍋氬師鍦板潃NG澶勭悊
+ /// 寮傚父鎺掑嚭鍙ｅ叆搴撴牎楠� 鎵�鏈夊紓甯镐氦缁橶CS鍋氬師鍦板潃NG澶勭悊
/// </summary>
/// <param name="input"></param>
/// <param name="stationManager"></param>
@@ -622,7 +630,7 @@
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- if (!content.Status) //鑾峰彇鏁寸洏鐢佃姱鏁版嵁锛� 濡傚紓甯� 浣跨敤绌烘绫诲瀷鍏ュ簱
+ if (!content.Status) //鑾峰彇鏁寸洏鐢佃姱鏁版嵁锛� 濡傚紓甯� 浣跨敤绌烘绫诲瀷鍏ュ簱
{
ConsoleHelper.WriteErrorLine(content.Message);
throw new Exception("MOM鏁寸洏鐢佃姱灞炴�ц幏鍙栧紓甯�");
@@ -654,6 +662,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return Epmtytask;
}
@@ -715,6 +724,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -735,9 +745,11 @@
throw new Exception(ex.Message);
}
}
+
#endregion
#region 绉诲簱浠诲姟浜嬪姟
+
private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo fromLocation, DtLocationInfo toLocation, int taskId)
{
_unitOfWorkManage.BeginTran();
@@ -780,6 +792,7 @@
#endregion MyRegion
#region 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
+
public WebResponseContent StockCheckingAsync()
{
WebResponseContent webResponseContent = new WebResponseContent();
@@ -864,12 +877,13 @@
#endregion 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
#region 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
+
public async Task<WebResponseContent> GetFROutTrayToCW(RequestTaskDto taskDTO)
{
WebResponseContent content = new WebResponseContent();
try
{
- var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position);
+ 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);
if (locations.Count > 10)
@@ -927,7 +941,6 @@
ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
var stackers = station.Roadway.Split(',').ToList();
-
var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
.Where(x => x.DeviceStatus == "1")
.Where(x => stackers.Contains(x.DeviceCode))
@@ -953,13 +966,24 @@
#endregion
+ #region 甯告俯3鍑哄簱鑷冲寘瑁�
+
+ /// <summary>
+ /// 甯告俯3鍑哄簱鑷冲寘瑁�
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
public async Task<WebResponseContent> RequestOutTaskToBZAsync(RequestTaskDto json)
{
WebResponseContent content = new WebResponseContent();
try
{
- Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call");
+ //LogFactory.GetLog("甯告俯3鍑哄簱鑷冲寘瑁�").Info(true, $"甯告俯3鍑哄簱鑷冲寘瑁呬紶鍏ュ弬鏁帮細" + JsonConvert.SerializeObject(json, Formatting.Indented));
+ Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call");
+ if (station == null) { throw new Exception($"鏈壘鍒板寘瑁呯珯鍙颁俊鎭紝璇锋鏌ヤ紶鍏ュ弬鏁皗json.Position}"); }
+
+ //LogFactory.GetLog("甯告俯3鍑哄簱鑷冲寘瑁�").Info(true, $"甯告俯3鍑哄簱鑷冲寘瑁呬紶鍏ュ弬鏁帮細" + JsonConvert.SerializeObject(json, Formatting.Indented));
var stockInfo = _stockInfoRepository.Db.Queryable<DtStockInfo>()
.Where(x => x.ProductionLine == station.productLine)
.Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
@@ -969,7 +993,7 @@
.First(); // 鑾峰彇绗竴涓厓绱�
//DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(X => X.IsFull && X.AreaCode == "CWSC3" && X.ProductionLine == station.productLine);
- if (stockInfo == null) throw new Exception("搴撳唴鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�");
+ if (stockInfo == null) throw new Exception($"搴撳唴{station.productLine}鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�");
DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.AreaId == 5 && x.LocationCode == stockInfo.LocationCode);
@@ -993,6 +1017,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = stockInfo.ProductionLine,
+ ProcessCode = stockInfo.ProcessCode,
};
WMSTaskDTO taskDTO = CreateTaskDTO(task);
@@ -1014,9 +1039,10 @@
}
}
-
+ #endregion
#region 鐏鍑哄簱
+
public WebResponseContent EmergencyTask(object obj)
{
WebResponseContent content = new WebResponseContent();
@@ -1062,7 +1088,6 @@
{
throw new Exception("宸叉坊鍔犵伀璀﹀嚭搴撲换鍔�");
}
-
int taskNum = BaseDal.GetTaskNo().Result;
Dt_Task task = new Dt_Task
@@ -1126,7 +1151,6 @@
LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, $"\r\r--------------------------------------");
LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, obj.ToJsonString());
return content.OK();
-
}
catch (Exception ex)
{
@@ -1135,5 +1159,93 @@
return content.Error(ex.Message);
}
}
+
+ #endregion
+
+ #region 鍒嗗绌烘鍏ュ簱鏀逛负鐩存帴鍑哄簱
+
+ public async Task<WebResponseContent> SetEmptyOutbyInToOutAsync(RequestTaskDto request)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == request.PalletCode);
+ if (!task.IsNullOrEmpty())
+ {
+ var fromStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == request.Position);
+ var toStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 7 && x.productLine == fromStation.productLine && x.stationArea == fromStation.stationArea);
+ if (!toStation.IsNullOrEmpty())
+ {
+ var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.AreaId == int.Parse(fromStation.stationArea));
+ task.TargetAddress = toStation.stationLocation;
+ task.NextAddress = toStation.stationChildCode;
+ task.Grade = 3;
+ task.TaskType = (int)TaskOutboundTypeEnum.InToOut;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
+
+ location.LocationStatus = (int)LocationEnum.Free;
+
+ await _locationRepository.UpdateDataAsync(location);
+ await BaseDal.UpdateDataAsync(task);
+ return content.OK("鎴愬姛");
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("鍒嗗绌烘鍏ュ簱鏀逛负鐩存帴鍑哄簱:鏈壘鍒板搴旂珯鍙�");
+ content.Error("鏈壘鍒板搴旂珯鍙�");
+ }
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("鍒嗗绌烘鍏ュ簱鏀逛负鐩存帴鍑哄簱:鏈壘鍒颁换鍔�");
+ content.Error("鏈壘鍒颁换鍔�");
+ }
+ return content;
+ }
+
+ #endregion
+
+ #region 鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱
+
+ /// <summary>
+ /// 鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> SetEmptyOutbyInToOutOneAsync(RequestTaskDto request)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == request.PalletCode);
+ if (!task.IsNullOrEmpty())
+ {
+ var toStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == request.Position);
+ var fromStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 6 && x.productLine == toStation.productLine && x.stationArea == toStation.stationArea);
+ if (!fromStation.IsNullOrEmpty())
+ {
+ //var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.AreaId == int.Parse(fromStation.stationArea));
+ task.SourceAddress = toStation.stationLocation;
+ task.CurrentAddress = toStation.stationChildCode;
+ task.Grade = 3;
+ task.TaskType = (int)TaskOutboundTypeEnum.InToOut;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
+
+ //location.LocationStatus = (int)LocationEnum.Free;
+
+ //await _locationRepository.UpdateDataAsync(location);
+ await BaseDal.UpdateDataAsync(task);
+ return content.OK("鎴愬姛");
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱:鏈壘鍒板搴旂珯鍙�");
+ content.Error("鏈壘鍒板搴旂珯鍙�");
+ }
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱:鏈壘鍒颁换鍔�");
+ content.Error("鏈壘鍒颁换鍔�");
+ }
+ return content;
+ }
+
#endregion
}
\ No newline at end of file
--
Gitblit v1.9.3