From 26748f9d2337faa40e7ed59a29d58dad161cd8a3 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期六, 15 二月 2025 13:01:09 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs | 129 +++++++++++++++++++++++++++++++------------
1 files changed, 93 insertions(+), 36 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
index 438e581..f336e6d 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
@@ -32,7 +32,9 @@
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.Caches;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_Core.HttpContextUser;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoRepository;
@@ -42,7 +44,9 @@
using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_SignalR;
using WIDESEAWCS_Tasks.ConveyorLineJob;
+using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
namespace WIDESEAWCS_Tasks
{
@@ -56,8 +60,13 @@
private readonly IMapper _mapper;
private readonly IDt_StationManagerService _stationManagerService;
private readonly ISys_ConfigService _sys_ConfigService;
+ private readonly ICacheService _cacheService;
+ private readonly INoticeService _noticeService;
+ private readonly IDt_needBarcodeRepository _needBarcodeRepository;
+ private static List<string>? userTokenIds;
+ private static List<int>? userIds;
- public CommonConveyorLine_AfterJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IDt_StationManagerService stationManagerService, ISys_ConfigService sys_ConfigService)
+ public CommonConveyorLine_AfterJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IDt_StationManagerService stationManagerService, ISys_ConfigService sys_ConfigService, ICacheService cacheService, INoticeService noticeService, IDt_needBarcodeRepository needBarcodeRepository)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -66,6 +75,9 @@
_taskRepository = taskRepository;
_stationManagerService = stationManagerService;
_sys_ConfigService = sys_ConfigService;
+ _cacheService = cacheService;
+ _noticeService = noticeService;
+ _needBarcodeRepository = needBarcodeRepository;
}
public async Task Execute(IJobExecutionContext context)
@@ -91,8 +103,28 @@
}
if (station.stationType == 6 && station.stationArea == "3")
{
- await GetEmptyTrayAsync(station);
+ await GetEmptyTrayAsync(station, conveyorLine, command);
}
+
+ #region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
+
+ var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
+ if (tokenInfos == null || !tokenInfos.Any())
+ {
+ //throw new Exception(conveyorLine.DeviceName + "缂撳瓨涓湭鎵惧埌Token缂撳瓨");
+ continue;
+ }
+ var userTokenIds = tokenInfos?.Select(x => x.Token_ID).ToList();
+ var userIds = tokenInfos?.Select(x => x.UserId).ToList();
+
+ object obj = new
+ {
+ childDeviceCode = station.stationChildCode,
+ commandAfter = command,
+ };
+ _noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });
+
+ #endregion 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
}
#region 璺敱鏂瑰紡
@@ -136,7 +168,13 @@
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
public void RequestInbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, Dt_StationManager stationInfo)
{
- ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆�,鎵樼洏鍙凤細銆恵command.ConveyorLineBarcode}銆�,绔欏彴锛氥�恵stationInfo.remark}銆戣姹備换鍔�");
+ var log = $"銆恵conveyorLine.DeviceName}銆�,鎵樼洏鍙凤細銆恵command.ConveyorLineBarcode}銆�,绔欏彴锛氥�恵stationInfo.remark}銆戣姹備换鍔�";
+ ConsoleHelper.WriteSuccessLine(log);
+
+ _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+ WriteInfo(conveyorLine.DeviceName, log);
+ //if()
+
var taskNew = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
if (taskNew == null)
{
@@ -145,14 +183,22 @@
Dt_Task task = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
if (task != null)
{
- //ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
- //taskCommand.InteractiveSignal = command.InteractiveSignal;
- //taskCommand.ResponState = 1;
- //taskCommand.ConveyorLineTaskNum = task.TaskNum;
- //taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress);
conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, stationInfo.stationChildCode);
- //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, 1, task.NextAddress);
- //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+
+ var needBarcode = _needBarcodeRepository.QueryFirst(x => x.toArea == stationInfo.stationChildCode);
+ if (needBarcode != null)
+ {
+ needBarcode.inLineNum -= 1;
+ _needBarcodeRepository.UpdateData(needBarcode);
+ }
+ }
+ }
+ else //濡傛灉浠诲姟璇锋眰澶辫触
+ {
+ //濡傛灉璇锋眰浣嶇疆涓嶯G浣嶇疆涓�鑷� 鍒欏啓褰撳墠浣嶇疆璁╃嚎浣撻��鍥�
+ if (stationInfo.stationChildCode == stationInfo.stationNGChildCode)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 2, stationInfo.stationChildCode);
}
}
}
@@ -176,14 +222,6 @@
Dt_Task task = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
if (task != null)
{
- //ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
- //taskCommand.InteractiveSignal = command.InteractiveSignal;
- //taskCommand.ResponState = 1;
- //taskCommand.ConveyorLineTaskNum = task.TaskNum;
- //taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress);
- //conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, stationInfo.stationChildCode);
- //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, 1, task.NextAddress);
- //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
}
}
}
@@ -226,29 +264,48 @@
// }
//}
- private async Task GetEmptyTrayAsync(Dt_StationManager stationManager)
+ private async Task GetEmptyTrayAsync(Dt_StationManager stationManager, CommonConveyorLine_After commonConveyor, ConveyorLineTaskCommand_After conveyorLine)
{
- var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
- var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.GetFROutTrayToCW)?.ConfigValue;
- if (wmsBase == null || requestTask == null)
+ ConveyorLineTaskCommand_After command = commonConveyor.ReadCustomer<ConveyorLineTaskCommand_After>((Convert.ToInt32(stationManager.stationChildCode) + 2).ToString());
+ if (conveyorLine.HasPallet == 1 || command.HasPallet == 1)
{
- throw new InvalidOperationException("WMS IP 鏈厤缃�");
- }
- var wmsIpAddrss = wmsBase + requestTask;
+ var needBarcode = _needBarcodeRepository.QueryFirst(x => x.toArea == stationManager.stationChildCode);
- var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = "", EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode }.ToJsonString());
- WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
- if(!content.Status)
+ if (needBarcode.inLineNum < needBarcode.cacheNum)
+ {
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.GetFROutTrayToCW)?.ConfigValue;
+ if (wmsBase == null || requestTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = wmsBase + requestTask;
+
+ var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = "", EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode, ProductionLine = stationManager.productLine }.ToJsonString());
+ WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (!content.Status)
+ {
+ //ConsoleHelper.WriteErrorLine($"鍒嗗鍛煎彨绌烘墭鐩樺け璐content.Message}");
+ return;
+ }
+ WMSTaskDTO wMSTaskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
+
+ ConsoleHelper.WriteSuccessLine(content.Data.ToString());
+ List<WMSTaskDTO> wMSTaskDTOs = new List<WMSTaskDTO>() { wMSTaskDTO };
+ _taskService.ReceiveWMSTask(wMSTaskDTOs);
+ needBarcode.inLineNum += 1;
+ _needBarcodeRepository.UpdateData(needBarcode);
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine($"鍒嗗绌烘墭鐩樺叆鍙ｃ�恵stationManager.stationChildCode}銆戝湪閫旀暟閲�>缂撳瓨鏁伴噺");
+ }
+ }
+ else
{
- //ConsoleHelper.WriteErrorLine($"鍒嗗鍛煎彨绌烘墭鐩樺け璐content.Message}");
- return;
+ ConsoleHelper.WriteErrorLine($"鍒嗗绌烘墭鐩樺叆鍙ｃ�恵stationManager.stationChildCode}銆戞湁鐩�");
}
- WMSTaskDTO wMSTaskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
-
- ConsoleHelper.WriteSuccessLine(content.Data.ToString());
- List<WMSTaskDTO> wMSTaskDTOs = new List<WMSTaskDTO>() { wMSTaskDTO };
- _taskService.ReceiveWMSTask(wMSTaskDTOs);
}
}
}
--
Gitblit v1.9.3