From b5fe109b08ce6e1e78696bb7cf41f415dc6a4587 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期四, 05 十二月 2024 13:33:35 +0800
Subject: [PATCH] 添加任务历史
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 156 insertions(+), 5 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index e15cb25..45b2837 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -4,12 +4,14 @@
using Quartz;
using SqlSugar;
using System.Reflection;
+using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO.MOM;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_IProcessRepository;
using WIDESEAWCS_ISystemServices;
@@ -21,6 +23,7 @@
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_Tasks.ConveyorLineJob;
+using static System.Collections.Specialized.BitVector32;
namespace WIDESEAWCS_Tasks
{
@@ -61,6 +64,21 @@
foreach (string childDeviceCode in childDeviceCodes)
{
await ProcessDeviceAsync(conveyorLine, childDeviceCode);
+ }
+
+ List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
+ foreach (var station in stationManagers)
+ {
+ ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
+ ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(station.stationChildCode, "DeviceCommand");
+ if (command != null && commandWrite != null)
+ {
+ var structs = BitConverter.GetBytes(commandWrite.WriteInteractiveSignal).Reverse().ToArray().ToBoolArray();
+ if (structs[0] == true)
+ {
+ NGRequestTaskInbound(conveyorLine, command, station.stationChildCode, 0, station.stationLocation);
+ }
+ }
}
}
}
@@ -103,7 +121,8 @@
var writeRead = conveyorLine.Communicator.Read<bool>(DeviceProAddress);
if (writeRead)
{
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, item.ProtocalDetailValue.ObjToInt(), false);
+ conveyorLine.Communicator.Write(DeviceProAddress, false);
+ //ConveyorLineSendFinish(conveyorLine, childDeviceCode, item.ProtocalDetailValue.ObjToInt(), false);
}
}
}
@@ -124,12 +143,12 @@
}
else
{
- if (!string.IsNullOrEmpty(platform.Location))
+ if (platform.Location != null && platform.Location != "")
{
var strings = platform.Location.Split(',').ToList();
foreach (var ite in strings)
{
- int index = strings.FindIndex(p => p == ite);
+ //int index = strings.FindIndex(p => p == ite);
ConveyorLineTaskCommand command1 = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(ite);
if (command1.InteractiveSignal != 2)
{
@@ -137,7 +156,8 @@
if (method != null)
{
command.InteractiveSignal = commandWrite.WriteInteractiveSignal;
- int count = strings.Count - index;
+ //int count = strings.Count - index;
+ int count = strings.Count;
method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
}
}
@@ -148,6 +168,7 @@
}
}
+ #region 鍏ュ簱
/// <summary>
/// 杈撻�佺嚎璇锋眰鍏ュ簱
/// </summary>
@@ -173,6 +194,31 @@
}
}
+ #region 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
+
+ /// <summary>
+ /// 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
+ /// </summary>
+ /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
+ /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+ /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+ public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
+ {
+ Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
+ if (task != null)
+ {
+ Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
+ if (newTask != null)
+ {
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
+ taskCommand.InteractiveSignal = command.InteractiveSignal;
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ }
+ }
+ }
+
+ #endregion
+
/// <summary>
/// 杈撻�佺嚎鍏ュ簱瀹屾垚
/// </summary>
@@ -193,6 +239,9 @@
}
}
+ #endregion
+
+ #region 鍑哄簱
/// <summary>
/// 杈撻�佺嚎璇锋眰鍑轰俊鎭�
/// </summary>
@@ -213,6 +262,29 @@
_taskService.UpdateTaskStatusToNext(task);
}
}
+
+ /// <summary>
+ /// 杈撻�佺嚎璇锋眰鍑哄簱涓嬩竴鍦板潃
+ /// </summary>
+ /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
+ /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+ /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+ public void RequestOutNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
+ {
+ Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
+ if (task != null)
+ {
+ Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
+ if (newTask != null)
+ {
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
+ taskCommand.InteractiveSignal = command.InteractiveSignal;
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
+ }
+ }
+
/// <summary>
/// 杈撻�佺嚎鍑哄簱瀹屾垚
/// </summary>
@@ -227,7 +299,7 @@
WebResponseContent content = new WebResponseContent();
ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
taskCommand.InteractiveSignal = command.InteractiveSignal;
- if (task.PalletCode != command.Barcode || task.Remark != null)
+ if (task.PalletCode != command.Barcode || task.Remark == "NG")
{
var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
taskCommand.TargetAddress = NGAddress;
@@ -242,6 +314,8 @@
content = _taskService.UpdateTaskStatusToNext(task);
}
}
+
+ #endregion
/// <summary>
/// 杈撻�佺嚎浜や簰瀹屾垚
@@ -259,6 +333,7 @@
conveyorLine.Communicator.Write(DeviceProAddress, value);
}
+ #region 妫�娴嬬┖鐩樺疄鐩樹换鍔�
/// <summary>
/// 鐩戞祴绌烘墭鐩樺疄鐩樺嚭搴�
/// </summary>
@@ -334,5 +409,81 @@
}
return content;
}
+ #endregion
+
+
+ #region 鍖栨垚NG鍙ｅ叆搴�
+
+ public void NGRequestTaskInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue, string TargetAddress)
+ {
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.MOMIP_BASE)?.ConfigValue;
+ var ipAddress = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.TrayCellsStatus)?.ConfigValue;
+ if (wmsBase == null || ipAddress == null)
+ {
+ throw new InvalidOperationException("MOM IP 鏈厤缃�");
+ }
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);
+ TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ {
+ Software = "WMS",
+ TrayBarcode = command.Barcode,
+ EquipmentCode = stationManager.stationEquipMOM,
+ SessionId = Guid.NewGuid().ToString(),
+ EmployeeNo = "MITest",
+ SceneType = "1",
+ RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
+ };
+
+ var MOMIpAddress = wmsBase + ipAddress;
+
+ var result = HttpHelper.PostAsync(MOMIpAddress, trayCells.ToJsonString()).Result;
+ WriteInfo("鍏ョ珯鏍￠獙", $"銆恵childDeviceCode}銆戝叆绔欐牎楠岃姹傚弬鏁般�恵trayCells.ToJsonString()}銆�");
+ WriteInfo("鍏ョ珯鏍￠獙", "");
+ WriteInfo("鍏ョ珯鏍￠獙", $"銆恵childDeviceCode}銆戝叆绔欐牎楠岃繑鍥炲弬鏁般�恵result}銆�");
+ ResultTrayCellsStatus result1 = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result);
+
+ var serialNosError = result1.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+ if (serialNosError.Count > 0)
+ {
+ return;
+ }
+
+ if (result1.SerialNos.Count <= 0)
+ {
+ // 绌烘墭鐩樺叆搴撻�昏緫
+ Dt_Task dt_Task = new Dt_Task()
+ {
+ TargetAddress = TargetAddress,
+ PalletCode = command.Barcode,
+ NextAddress = TargetAddress,
+ TaskNum = 0
+ };
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(dt_Task);
+ taskCommand.InteractiveSignal = command.InteractiveSignal;
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
+ else
+ {
+ // 绌烘墭鐩樺叆搴撻�昏緫
+ Dt_Task dt_Task = new Dt_Task()
+ {
+ TargetAddress = TargetAddress,
+ PalletCode = command.Barcode,
+ NextAddress = "1000",
+ TaskNum = 0
+ };
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(dt_Task);
+ taskCommand.InteractiveSignal = command.InteractiveSignal;
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
+ }
+
+
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3