From 0939aa5f3cc12a8856456a51cf2b661b6cd780c7 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 31 七月 2025 17:25:49 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 1038b0a..4c64d14 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -21,6 +21,8 @@
using Newtonsoft.Json;
using Quartz;
using System.Reflection;
+using System.Text;
+using System.Web;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
@@ -105,7 +107,8 @@
try
{
ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
- //var Barcode = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.ConveyorLineBarcode, station.stationChildCode);
+ //var x = conveyorLine.Communicator.Read("DB1103.2",5);
+ //string Barcode = Encoding.UTF8.GetString(x);
if (command != null)
{
#region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
@@ -129,7 +132,7 @@
foreach (var item in deviceProtocolDetails)
{
int itemValue = Convert.ToInt32(item.ProtocalDetailValue);
- _noticeService.LineData(userIds?.FirstOrDefault(), userTokenIds, new { station.stationChildCode,InStock= structs[itemValue] , Roadway =station.Roadway});
+ _noticeService.LineData(userIds?.FirstOrDefault(), userTokenIds, new { station.stationChildCode,InStock= structs[itemValue] , Roadway =station.Roadway+station.stationFloor});
if (structs[itemValue] == true)
{
MethodInfo? method = GetType().GetMethod(item.ProtocolDetailType);
@@ -162,8 +165,21 @@
var log = $"銆恵conveyorLine._deviceName}銆戠珯鍙般�恵station.stationChildCode}銆戣姹傚彇璐�";
await LogAndWarn(conveyorLine.DeviceName, log);
- var task = _taskService.QueryConveyorLineTask(station.stationChildCode, command.TaskNum);
+ if (station.stationChildCode == "3004")
+ {
+ var taskIn = _taskRepository.QueryFirst(x => x.TaskNum == command.TaskNum && x.NextAddress == station.stationChildCode && x.TaskType == (int)TaskInboundTypeEnum.Inbound&&x.TaskState==(int)TaskInStatusEnum.HoistInExecuting);
+ if(taskIn != null)
+ {
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.Roadway == taskIn.Roadway && x.stationType == 3 && x.stationFloor == taskIn.Floor);
+ taskIn.CurrentAddress = station.stationChildCode;
+ taskIn.NextAddress = stationManager.stationChildCode;
+ taskIn.TaskState = (int)TaskInStatusEnum.InNew;
+ _taskRepository.UpdateData(taskIn);
+ }
+ }
+ var task = _taskService.QueryConveyorLineTask(station.stationChildCode, command.TaskNum);
+
await HandleNewTaskAsync(conveyorLine, command, station.stationChildCode, task);
}
catch (Exception ex)
--
Gitblit v1.9.3