From a6ea79849f0142b5280f0c5d4b15ecc83f0d015a Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 21 十二月 2024 09:52:27 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 393 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 299 insertions(+), 94 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 89e5155..559f10b 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,7 +1,18 @@
-锘縰sing Masuit.Tools;
+锘縰sing Castle.Components.DictionaryAdapter.Xml;
+using log4net.Core;
+using Masuit.Tools;
+using System.CodeDom;
+using System.Threading.Tasks;
+using WIDESEA_Common;
+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;
namespace WIDESEA_StorageTaskServices;
@@ -43,8 +54,6 @@
return content.OK(data: taskDTO);
}
}
-
-
// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
content = await CreateNewTask(input);
}
@@ -66,49 +75,51 @@
/// <returns></returns>
private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input)
{
- WebResponseContent content = new WebResponseContent();
-
- //DtLocationInfo locationInfo = await RequestLocation(input);
-
- //if (locationInfo == null) throw new Exception("搴撲綅宸叉弧");
-
- var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
-
- if (stationinfo == null) throw new Exception("鏈煡绔欏彴");
-
- if (stationinfo.stationType != 7)
+ try
{
- if (input.PalletCode == null || input.PalletCode.Trim() == "")
- return content.Error($"銆恵stationinfo.remark}銆戞墭鐩樻潯鐮佷负绌�");
- }
- var task = await CreateNewTaskByStation(input, stationinfo);
+ WebResponseContent content = new WebResponseContent();
- // 灏濊瘯娣诲姞鏂颁换鍔�
- if (task == null) return content.Error();
- var taskId = await BaseDal.AddDataAsync(task);
- bool isResult = taskId > 0;
- if (isResult)
- {
- // 鍒涘缓WMS浠诲姟
- WMSTaskDTO taskDTO = new WMSTaskDTO()
+ var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
+
+ if (stationinfo == null) throw new Exception("鏈煡绔欏彴");
+
+ if (stationinfo.stationType != 7)
{
- 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,
- };
- content.OK(data: taskDTO);
+ if (input.PalletCode == null || input.PalletCode.Trim() == "")
+ return content.Error($"銆恵stationinfo.remark}銆戞墭鐩樻潯鐮佷负绌�");
+ }
+ var task = await CreateNewTaskByStation(input, stationinfo);
-
+ // 灏濊瘯娣诲姞鏂颁换鍔�
+ if (task == null) return content.Error();
+ var taskId = await BaseDal.AddDataAsync(task);
+ bool isResult = taskId > 0;
+ if (isResult)
+ {
+ // 鍒涘缓WMS浠诲姟
+ 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,
+ };
+ content.OK(data: taskDTO);
+ }
+ else
+ content.Error("娣诲姞浠诲姟澶辫触");
+ return content;
}
- else
- content.Error("娣诲姞浠诲姟澶辫触");
- return content;
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
}
/// <summary>
@@ -120,25 +131,32 @@
/// <exception cref="Exception"></exception>
private async Task<Dt_Task> CreateNewTaskByStation(RequestTaskDto input, Dt_StationManager stationManager)
{
- Dt_Task task = null;
- switch (stationManager.stationType)
+ try
{
- case 6:
- case 1:
- task = await CreateInTaskAsync(input, stationManager); break;
- //case 2:
- case 3: //寮傚父鎺掑嚭缁橶CS澶勭悊
- //case 4:
- case 5:
- task = await CreateInToOutTaskAsync(input, stationManager); break;
- case 7:
- task = await CreateEmptyOutTaskAsync(input, stationManager); break;
- case 15:
- task = await CheckAbnormalTaskAsync(input, stationManager); break;
- default:
- throw new Exception("鏈煡绔欏彴绫诲瀷");
+ Dt_Task task = null;
+ switch (stationManager.stationType)
+ {
+ case 6:
+ case 1:
+ task = await CreateInTaskAsync(input, stationManager); break;
+ //case 2:
+ case 3: //寮傚父鎺掑嚭缁橶CS澶勭悊
+ //case 4:
+ case 5:
+ task = await CreateInToOutTaskAsync(input, stationManager); break;
+ case 7:
+ task = await CreateEmptyOutTaskAsync(input, stationManager); break;
+ case 15:
+ task = await CheckAbnormalTaskAsync(input, stationManager); break;
+ default:
+ throw new Exception("鏈煡绔欏彴绫诲瀷");
+ }
+ return task;
}
- return task;
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
#region 鐩存帴鍑哄簱浠诲姟
@@ -174,7 +192,7 @@
var taskNG = new Dt_Task
{
CurrentAddress = input.Position,
- Grade = 1,
+ Grade = 3,
Roadway = input.Roadways,
TargetAddress = stationManager.stationNGLocation,
Dispatchertime = DateTime.Now,
@@ -365,6 +383,7 @@
#region 搴撲綅鍒嗛厤
+ #region 鑾峰彇璐т綅
/// <summary>
///
/// </summary>
@@ -373,8 +392,6 @@
/// <returns></returns>
private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask, bool isCheckRequest = false)
{
- #region 鑾峰彇璐т綅
-
try
{
List<DtLocationInfo> locations;
@@ -399,17 +416,46 @@
Console.WriteLine(err.Message.ToString());
return null;
}
-
- #endregion 鑾峰彇璐т綅
}
+ #endregion 鑾峰彇璐т綅
+
+ #region 寮傚父鍙ｅ叆搴撹幏鍙栧簱浣�
+ private async Task<DtLocationInfo> RequestLocationByAbnormal(RequestTaskDto requestTask, bool isCheckRequest = false)
+ {
+ try
+ {
+ List<DtLocationInfo> locations;
+ if (isCheckRequest)
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 2 && x.Remark == "1");
+ }
+ else
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ }
+
+ if (locations == null)
+ {
+ return null;
+ }
+
+ return locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+ }
+ catch (Exception err)
+ {
+ Console.WriteLine(err.Message.ToString());
+ return null;
+ }
+ }
+ #endregion
#endregion 搴撲綅鍒嗛厤
// 鑾峰彇宸ヨ壓鐢宠
- private async Task<ProcessApplyDto> GetProcessApplyAsync(RequestTaskDto input, ResultTrayCellsStatus content)
+ private Task<ProcessApplyDto> GetProcessApplyAsync(RequestTaskDto input, ResultTrayCellsStatus content)
{
// 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
- return new ProcessApplyDto()
+ return Task.FromResult(new ProcessApplyDto()
{
EquipmentCode = input.EquiCodeMOM,
Software = "WMS",
@@ -418,7 +464,7 @@
{
SerialNo = item.SerialNo
}).ToList()
- };
+ });
}
#endregion 璇锋眰浠诲姟鍏ュ簱
@@ -486,12 +532,22 @@
return content.Error(ex.Message);
}
}
+ #endregion
#region 寮傚父鍙ｄ换鍔℃娴�
+ /// <summary>
+ /// 寮傚父鎺掑嚭鍙ｅ叆搴撴牎楠� 鎵�鏈夊紓甯镐氦缁橶CS鍋氬師鍦板潃NG澶勭悊
+ /// </summary>
+ /// <param name="input"></param>
+ /// <param name="stationManager"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public async Task<Dt_Task> CheckAbnormalTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
{
try
{
+ if (stationManager.stationType == 15) throw new Exception("");
+
// 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
{
@@ -504,32 +560,39 @@
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- if (!content.Status) throw new Exception(content.Message);
+ if (!content.Status) //鑾峰彇鏁寸洏鐢佃姱鏁版嵁锛� 濡傚紓甯� 浣跨敤绌烘绫诲瀷鍏ュ簱
+ {
+ ConsoleHelper.WriteErrorLine(content.Message);
+ throw new Exception("MOM鏁寸洏鐢佃姱灞炴�ц幏鍙栧紓甯�");
+ }
// 娣诲姞缁勭洏淇℃伅
// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- if (result.SerialNos.Count <= 0)
+ if (result.SerialNos.Count <= 0) //濡傝皟鐢ㄦ垚鍔� 浣嗙數鑺负0鍒欏畾涓虹┖鐩�
{
- ConsoleHelper.WriteErrorLine(result.MOMMessage);
- var taskNG = new Dt_Task
+ DtLocationInfo EmptylocationInfo = await RequestLocationByAbnormal(input);
+
+ if (EmptylocationInfo == null) throw new Exception("搴撲綅宸叉弧");
+
+ var Epmtytask = new Dt_Task
{
CurrentAddress = input.Position,
- Grade = 1,
+ Grade = 3, //浼樺厛澶勭悊寮傚父鎺掑嚭鍙ｇ殑浠诲姟 闃叉姝ｅ父闇�鎺掑嚭寮傚父鍙ｇ殑浠诲姟鍫电嚎
Roadway = input.Roadways,
- TargetAddress = stationManager.stationNGLocation,
+ TargetAddress = EmptylocationInfo.LocationCode,
Dispatchertime = DateTime.Now,
MaterialNo = "",
- NextAddress = stationManager.stationNGChildCode,
+ NextAddress = input.Roadways,
OrderNo = null,
PalletCode = input.PalletCode,
SourceAddress = stationManager.stationLocation,
TaskState = (int)TaskInStatusEnum.Line_InFinish,
- TaskType = (int)TaskOutboundTypeEnum.InToOut,
+ TaskType = (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
- return taskNG;
+ return Epmtytask;
}
//Console.WriteLine(result);
@@ -542,45 +605,64 @@
var boxing = CreateBoxingInfo(result, input.PalletCode);
if (boxing == null) throw new Exception("缁勭洏澶辫触");
- //// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
- //ProcessApplyDto process = await GetProcessApplyAsync(input, result);
+ if (!stationManager.Roadway.Contains("FR")) //闈炲垎瀹瑰簱鍖� 鍏ュ簱楠岃瘉宸ヨ壓璺嚎
+ {
+ // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
+ ProcessApplyDto process = await GetProcessApplyAsync(input, result);
- //// 濡傛灉process涓簄ull锛屽垯杩斿洖content
- //if (process == null) return content;
+ // 濡傛灉process涓簄ull锛屽垯杩斿洖content
+ if (process == null) throw new Exception("宸ヨ壓璇锋眰鍙傛暟寮傚父");
- //// 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
- //content = await _processApplyService.GetProcessApplyAsync(process);
+ // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+ content = await _processApplyService.GetProcessApplyAsync(process);
- //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
- //if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
-
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+ if (!content.Status) throw new Exception("宸ヨ壓鐢宠澶辫触");
+ }
////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
////var processResponse = await GetProcessResponseAsync(process, input.Position);
- var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+
+ DtLocationInfo locationInfo = null;
+ if (stationManager.Roadway.Contains("FR"))
+ {
+ locationInfo = await RequestLocation(input, true);
+ }
+ else
+ {
+ locationInfo = await RequestLocationByAbnormal(input);
+ }
+ //DtLocationInfo locationInfo = await RequestLocation(input);
+
+ if (locationInfo == null) throw new Exception("搴撲綅宸叉弧");
var task = new Dt_Task
{
CurrentAddress = input.Position,
- Grade = 1,
+ Grade = 3, //浼樺厛澶勭悊寮傚父鎺掑嚭鍙ｇ殑浠诲姟 闃叉姝ｅ父闇�鎺掑嚭寮傚父鍙ｇ殑浠诲姟鍫电嚎
Roadway = input.Roadways,
- TargetAddress = stationManager.stationLocation,
+ TargetAddress = locationInfo.LocationCode,
Dispatchertime = DateTime.Now,
MaterialNo = "",
NextAddress = input.Roadways,
OrderNo = null,
- //PalletCode = stockinfo.PalletCode,
- //SourceAddress = stockinfo.LocationCode,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.OutTray,
+ PalletCode = input.PalletCode,
+ SourceAddress = stationManager.stationLocation,
+ TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ TaskType = (int)TaskInboundTypeEnum.Inbound,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+
+ ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + locationInfo.LocationStatus.ToString());
+ locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
+ ConsoleHelper.WriteSuccessLine($"淇敼鍚庯細" + locationInfo.LocationStatus.ToString());
+ await UpdateLocationAsync(locationInfo);
return task;
}
catch (Exception ex)
{
-
throw new Exception(ex.Message);
}
}
@@ -766,7 +848,7 @@
{
Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position);
- DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(X => X.IsFull && X.AreaCode == "CWSC3" && X.ProductionLine == "ZJ-7");
+ DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(X => X.IsFull && X.AreaCode == "CWSC3" && X.ProductionLine == station.productLine);
if (stockInfo == null) throw new Exception("搴撳唴鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�");
Dt_StationManager OutStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == "1016" && x.stationType == 10);
@@ -801,4 +883,127 @@
return content.Error($"澶辫触锛歿ex.Message}");
}
}
-}
\ No newline at end of file
+
+
+
+ #region 鐏鍑哄簱
+ public WebResponseContent EmergencyTask(object obj)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var emergencyTask = new DTSEmergencyTask();
+ try
+ {
+ 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.RoadwayNo == emergencyTask.Roadway);
+ if (locationInfo == null)
+ {
+ 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)
+ {
+ 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());
+ return content.OK();
+
+ }
+ catch (Exception ex)
+ {
+ LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, ex.Message);
+ return content.Error(ex.Message);
+ }
+ }
+ #endregion
+}
\ No newline at end of file
--
Gitblit v1.9.3