From eae9077f3978f695f4e3af5301e8a08bdd8bf23c Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期一, 09 十二月 2024 09:24:46 +0800
Subject: [PATCH] 最新程序
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 363 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 330 insertions(+), 33 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 93021c6..6a5b440 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,13 @@
-锘縰sing log4net.Core;
+锘�
+using log4net.Core;
using Mapster;
using Masuit.Tools;
using Masuit.Tools.Models;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using SixLabors.Fonts.Tables.AdvancedTypographic;
using System.Diagnostics;
+using WIDESEA_Common;
+using WIDESEA_Core.Const;
using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
@@ -14,7 +19,7 @@
using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_Model.Models;
-namespace WIDESEA_StorageOutTaskServices;
+namespace WIDESEA_StorageTaskServices;
public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
@@ -386,7 +391,12 @@
}
}
- // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+ //if (input.area != 3)
+ //{
+ // if (input.PalletCode == null || input.PalletCode.Trim() == "")
+ // return content.Error("鎵樼洏鏉＄爜涓虹┖");
+ //}
+ //鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
//TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
//{
// Software = "WMS",
@@ -395,13 +405,13 @@
// EquipmentCode = input.EquiCodeMOM
//};
- //// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
//content = await GetTrayCellStatusAsync(trayCells);
- //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
//if (!content.Status) return content;
- //// 娣诲姞缁勭洏淇℃伅
- //// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ // 娣诲姞缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
//var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
//if (result.SerialNos.Count <= 0)
// return content.Error(result.MOMMessage);
@@ -413,8 +423,7 @@
//// return content.Error("鏂欐灞炴�т笉瀛樺湪");
//// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
-
- //var boxing = await CreateBoxingInfo(result, input.PalletCode);
+ //var boxing = CreateBoxingInfo(result, input.PalletCode);
//if (boxing == null) return content.Error("缁勭洏澶辫触");
//// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
@@ -466,7 +475,11 @@
if (stationinfo == null) throw new Exception("鏈煡绔欏彴");
-
+ if (stationinfo.stationType != 7)
+ {
+ if (input.PalletCode == null || input.PalletCode.Trim() == "")
+ return content.Error($"銆恵stationinfo.remark}銆戞墭鐩樻潯鐮佷负绌�");
+ }
var task = await CreateNewTaskByStation(input, stationinfo);
// 鍒涘缓鏂颁换鍔″疄渚�
@@ -507,6 +520,8 @@
TaskType = task.TaskType,
};
content.OK(data: taskDTO);
+
+
}
else
content.Error("娣诲姞浠诲姟澶辫触");
@@ -529,13 +544,14 @@
case 1:
task = await CreateInTaskAsync(input, stationManager); break;
//case 2:
- //case 3: //寮傚父鎺掑嚭缁橶CS澶勭悊
+ case 3: //寮傚父鎺掑嚭缁橶CS澶勭悊
//case 4:
case 5:
task = await CreateInToOutTaskAsync(input, stationManager); break;
-
+ case 7:
+ task = await CreateEmptyOutTaskAsync(input, stationManager); break;
default:
- throw new Exception("浣嶇疆绔欏彴绫诲瀷");
+ throw new Exception("鏈煡绔欏彴绫诲瀷");
}
return task;
}
@@ -543,7 +559,80 @@
#region 鐩存帴鍑哄簱浠诲姟
private async Task<Dt_Task> CreateInToOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
{
- if (stationManager.stationType != 5) throw new Exception("閿欒鐨勮皟鍙�");
+ //if (stationManager.stationType != 5) throw new Exception("閿欒鐨勮皟鍙�");
+
+
+ input.EquiCodeMOM = "24MEJQ11-1006-1";
+
+ // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+ TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ {
+ Software = "WMS",
+ TrayBarcode = input.PalletCode,
+ //EquipmentCode = "EQ_CWJZ01"
+ EquipmentCode = input.EquiCodeMOM
+ };
+
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ if (!content.Status) throw new Exception(content.Message);
+
+ // 娣诲姞缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (result.SerialNos.Count <= 0)
+ {
+ ConsoleHelper.WriteErrorLine(result.MOMMessage);
+ 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.OutNG,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+ return taskNG;
+ }
+ }
+
+ // 澶勭悊寮傚父鐢佃姱鎯呭喌
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).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.OutNG,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+ return taskNG;
+ }
+ }
var targetStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == stationManager.stationPLC && x.Roadway == stationManager.Roadway && x.stationType == 2);
@@ -575,7 +664,16 @@
{
if (stationManager.stationType != 1 && stationManager.stationType != 6) throw new Exception("閿欒鐨勮皟鍙�");
- DtLocationInfo locationInfo = await RequestLocation(input);
+ DtLocationInfo locationInfo = null;
+ if (stationManager.stationType == 1 && stationManager.Roadway.Contains("FR"))
+ {
+ locationInfo = await RequestLocation(input, true);
+ }
+ else
+ {
+ locationInfo = await RequestLocation(input);
+ }
+ //DtLocationInfo locationInfo = await RequestLocation(input);
if (locationInfo == null) throw new Exception("搴撲綅宸叉弧");
@@ -590,16 +688,36 @@
EquipmentCode = input.EquiCodeMOM
};
- //// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- //content = await GetTrayCellStatusAsync(trayCells);
- //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- //if (!content.Status) return content;
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ if (!content.Status) throw new Exception(content.Message);
- //// 娣诲姞缁勭洏淇℃伅
- //// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- //if (result.SerialNos.Count <= 0)
- // return content.Error(result.MOMMessage);
+ // 娣诲姞缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (result.SerialNos.Count <= 0)
+ {
+ ConsoleHelper.WriteErrorLine(result.MOMMessage);
+ 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.OutNG,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+ return taskNG;
+ }
//Console.WriteLine(result);
//// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
@@ -608,9 +726,8 @@
//// return content.Error("鏂欐灞炴�т笉瀛樺湪");
//// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
-
- //var boxing = await CreateBoxingInfo(result, input.PalletCode);
- //if (boxing == null) return content.Error("缁勭洏澶辫触");
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ if (boxing == null) throw new Exception("缁勭洏澶辫触");
//// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
//ProcessApplyDto process = await GetProcessApplyAsync(input, result);
@@ -626,6 +743,7 @@
////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
////var processResponse = await GetProcessResponseAsync(process, input.Position);
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
}
var task = new Dt_Task
@@ -659,13 +777,13 @@
/// </summary>
/// <param name="requestTask">璇锋眰鍙傛暟</param>
/// <returns></returns>
- private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask)
+ private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask, bool isCheckRequest = false)
{
#region 鑾峰彇璐т綅
try
{
List<DtLocationInfo> locations;
- if (requestTask.Roadways.Contains("FR"))
+ 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");
}
@@ -687,7 +805,7 @@
return null;
}
#endregion 鑾峰彇璐т綅
- }
+ }
#endregion
// 鑾峰彇宸ヨ壓鐢宠
@@ -706,8 +824,52 @@
};
}
- #endregion 璇锋眰浠诲姟鍏ュ簱
+ #endregion 璇锋眰绌烘鍑哄簱
+ public async Task<Dt_Task> CreateEmptyOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
+ {
+ try
+ {
+ if (stationManager.stationType != 7) throw new Exception("閿欒鐨勮皟鍙�");
+
+ var stockinfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo)
+ //.Includes(x=>x.StockInfoDetails)
+ .Where(x => !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway)
+ .OrderBy(x => x.CreateDate)
+ .FirstAsync();
+
+ if (stockinfo == null) return null;
+
+ var task = new Dt_Task
+ {
+ CurrentAddress = input.Position,
+ Grade = 1,
+ Roadway = input.Roadways,
+ TargetAddress = stationManager.stationLocation,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = input.Roadways,
+ OrderNo = null,
+ PalletCode = stockinfo.PalletCode,
+ SourceAddress = stockinfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.OutTray,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+
+ return task;
+ }
+ catch (Exception ex)
+ {
+
+ throw new Exception(ex.Message);
+ }
+ }
+
+
+ #region 鐩存帴鍑哄簱浠诲姟瀹屾垚
public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
{
WebResponseContent content = new WebResponseContent();
@@ -723,10 +885,145 @@
}
catch (Exception ex)
{
- return content.Error (ex.Message);
+ return content.Error(ex.Message);
}
-
+ }
+ #endregion
+
+
+ #region 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
+
+ public WebResponseContent StockCheckingAsync()
+ {
+
+ WebResponseContent webResponseContent = new WebResponseContent();
+ try
+ {
+ Task.Run(async () =>
+ {
+ while (true)
+ {
+ try
+ {
+ Thread.Sleep(10000);
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1");
+
+ var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
+ .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
+ .Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+ .OrderBy(x => x.OutboundTime) // 鎺掑簭
+ .ToListAsync(); // 鑾峰彇绗竴涓厓绱�
+
+ if (stockInfo.Count <= 0) continue;
+ foreach (var item in stockInfo)
+ {
+
+ var hasTask = BaseDal.QueryFirst(x => x.PalletCode == item.PalletCode);
+ if (hasTask != null)
+ {
+ Console.WriteLine("宸插瓨鍦ㄥ嚭搴撲换鍔�");
+ continue;
+ }
+
+ string position = string.Empty;
+ if (item.LocationInfo.RoadwayNo == "GWSC1")
+ position = "1059";
+ else
+ position = "1065";
+
+ var task = CreateTask(item, position, (int)TaskOutboundTypeEnum.Outbound);
+ task.NextAddress = "002-000-002";
+ // 鍒涘缓浠诲姟DTO
+ WMSTaskDTO taskDTO = CreateTaskDTO(task);
+
+
+ var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
+ var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;
+ if (wmsBase == null || ipAddress == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + ipAddress;
+
+ var result = HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
+ var content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (content.Status)
+ {
+ await BaseDal.AddDataAsync(task);
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ await _locationRepository.UpdateDataAsync(item.LocationInfo);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
+ });
+ return webResponseContent.OK();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message.ToString());
+ return webResponseContent.Error(ex.Message);
+ }
+ }
+
+ #endregion
+
+ #region 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
+
+ public async Task<WebResponseContent> GetFROutTrayToCW(RequestTaskDto taskDTO)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position);
+ var locations = _locationRepository.QueryData(x => x.RoadwayNo == station.Roadway && x.LocationStatus == (int)LocationEnum.Free && x.LocationType == 1);
+ ConsoleHelper.WriteSuccessLine(station.Roadway);
+ var taskRun = BaseDal.QueryData(x => x.TaskType == (int)TaskOutboundTypeEnum.OutTray && x.Roadway.Contains("CW"));
+
+
+ ConsoleHelper.WriteSuccessLine(locations.Count.ToString());
+
+ ConsoleHelper.WriteSuccessLine(taskRun.Count.ToString());
+ var number = locations.Count - taskRun.Count;
+ ConsoleHelper.WriteSuccessLine(number.ToString());
+ if (number > 10)
+ {
+ ConsoleHelper.WriteColorLine(number.ToString(), ConsoleColor.Blue);
+ var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1", new List<string>());
+
+
+ var task = CreateTask(stockInfo, taskDTO.Position, (int)TaskOutboundTypeEnum.OutTray);
+
+ // 鍒涘缓浠诲姟DTO
+ WMSTaskDTO wmsTask = CreateTaskDTO(task);
+
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(task);
+ await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
+ });
+
+ // 杩斿洖鎴愬姛鍝嶅簲
+ return content.OK(data: wmsTask);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
return content;
}
+ #endregion
+
}
\ No newline at end of file
--
Gitblit v1.9.3