From 257d09aff7ec7b858b037607869d23ec61ac75bc Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期二, 19 八月 2025 09:03:49 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/ConveyorLineJob_BC.cs | 171 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 114 insertions(+), 57 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs"
index 7f50783..a65687c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs"
@@ -1,4 +1,5 @@
锘縰sing Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using Quartz;
using SqlSugar;
using System;
@@ -98,7 +99,22 @@
ConveyorLineSignal conveyorLineSignalRead = conveyorLineInfoRead.Signal.ByteToBoolObject<ConveyorLineSignal>();
ConveyorLineSignal conveyorLineSignalWrite = conveyorLineInfoWrite.Signal.ByteToBoolObject<ConveyorLineSignal>();
-
+ //婊℃墭鎷夎浇鍑�
+ if (item.StationType == StationTypeEnum.StationType_PakcPallet.ObjToInt())
+ {
+ if (conveyorLineSignalRead.STB && !conveyorLineSignalWrite.ACK)
+ {
+ device.SetValue(W_ConveyorLineDB.TaskNum, 1, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.StartPos, item.StationCode, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.EndPos, 1102, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);
+ device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
+ }
+ else if(!conveyorLineSignalRead.STB && conveyorLineSignalWrite.ACK)
+ {
+ device.SetValue(W_ConveyorLineDB.ACK, false, item.StationCode);
+ }
+ }
if (item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt())
{
{
@@ -106,12 +122,14 @@
Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) /*&& x.DeviceCode == item.StationDeviceCode*/ && (x.TaskState == TaskStatusEnum.New.ObjToInt()) && x.WarehouseId == warehouseDevice.WarehouseId);
if (task != null && conveyorLineInfoWrite.Spare2 == 0 && conveyorLineStatus.Goods)
{
- List<string> stations = _routerExtension.GetEndPoint(item.StationCode, TaskTypeEnum.Inbound.ObjToInt()).Select(x => x.NextPosi).ToList();
- WebResponseContent responseContent = _taskService.RequestWMSAssignRoadway(stations, task.TaskNum, conveyorLineInfoRead.Spare2);
- if (responseContent.Status)
+ device.SetValue(W_ConveyorLineDB.Spare2, 1, item.StationCode);
+ _taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: item.StationDeviceCode);
+ }
+ else
+ {
+ if (conveyorLineInfoWrite.Spare2 != 0)
{
- device.SetValue(W_ConveyorLineDB.Spare2, 1, item.StationCode);
- _taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: item.StationDeviceCode, roadwayNo: responseContent.Data.ToString() ?? "");
+ WriteDebug(device.DeviceName, $"鍚姩淇″彿宸插啓鍏�");
}
}
#endregion
@@ -121,10 +139,21 @@
{
if (conveyorLineInfoRead.TaskNum == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))//閲囪喘鍏ュ簱
{
- #region 浠诲姟鍙蜂负0锛屼笖鏈夋墭鐩樺彿锛屽垯鏄噰璐叆搴�
+ #region 浠诲姟鍙蜂负0锛屼笖鏈夋墭鐩樺彿锛屽垯鏄汉宸ユ斁璐у叆搴�
Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.DeviceCode == item.StationDeviceCode && (x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt()) && x.PalletCode == conveyorLineInfoRead.Barcode && x.WarehouseId == warehouseDevice.WarehouseId);
if (task != null)
{
+ List<string> stations = _routerExtension.GetEndPoint(item.StationCode, TaskTypeEnum.Inbound.ObjToInt()).Select(x => x.NextPosi).ToList();
+ //鍒嗛厤宸烽亾
+ if (stations.Count>1)
+ {
+ WebResponseContent responseContent = _taskService.RequestWMSAssignRoadway(stations, task.TaskNum, conveyorLineInfoRead.Spare2);
+ if (responseContent.Status)
+ {
+ _taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, roadwayNo: responseContent.Data.ToString() ?? "",heightType: conveyorLineInfoRead.Spare2);
+ }
+ }
+
device.SetValue(W_ConveyorLineDB.Spare2, 0, item.StationCode);
string currentAddress = task.CurrentAddress;
@@ -165,31 +194,42 @@
}
else
{
- device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);
+ //task.NextAddress鍙兘鏄痳outer.NextPosi
+ nextAddress = router.NextPosi;
+ device.SetValue(W_ConveyorLineDB.EndPos, router.NextPosi, item.StationCode);
}
device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode);
device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);
device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);
device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
- _taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress, targetAddress: targetAddress, deviceCode: deviceCode);
+ if (router.IsEnd)
+ {
+ _taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress, targetAddress: targetAddress, deviceCode: deviceCode);
+ }
+ else
+ {
+ _taskService.UpdateTask(task, taskState, nextAddress: nextAddress);
+ }
+
+ }
+ else
+ {
+ WriteInfo(device.DeviceName, $"鏈壘鍒版墭鐩榹conveyorLineInfoRead.Barcode}瀵瑰簲鐨勪换鍔′俊鎭�");
}
#endregion
}
- else//鐢熶骇閫�搴�
+ else//鐢熶骇閫�搴� //鎹㈠贩閬撳叆搴�
{
#region 鐢熶骇閫�搴�,甯︿换鍔″彿鏌ヨ浠诲姟
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.TaskNum && x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.WarehouseId == warehouseDevice.WarehouseId); // 甯︿换鍔″彿鏌ヨ浠诲姟
- if (task != null)
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.TaskNum && x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.WarehouseId == warehouseDevice.WarehouseId && x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt()); // 甯︿换鍔″彿鏌ヨ浠诲姟 閫�鏂欎换鍔�
+ Dt_Task taskIn = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.TaskNum && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.DeviceCode == item.StationDeviceCode && x.NextAddress == item.StationCode && x.WarehouseId == warehouseDevice.WarehouseId && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt()); // 甯︿换鍔″彿鏌ヨ浠诲姟 鍏ュ簱
+ if (task != null) //閫�鏂欎换鍔� 璧风偣鍏ュ簱绔欏彴
{
List<string> stations = _routerExtension.GetEndPoint(item.StationCode, TaskTypeEnum.Inbound.ObjToInt()).Select(x => x.NextPosi).ToList();
WebResponseContent responseContent = _taskService.RequestWMSAssignRoadway(stations, task.TaskNum, conveyorLineInfoRead.Spare2);
if (responseContent.Status)
{
- //string currentAddress = task.CurrentAddress;
- //string nextAddress = task.NextAddress;
- //string targetAddress = task.TargetAddress;
string roadwayNo = task.Roadway;
-
string currentAddress = task.CurrentAddress;
string nextAddress = task.NextAddress;
string targetAddress = task.TargetAddress;
@@ -208,7 +248,7 @@
continue;
}
- if (router.IsEnd)
+ if (router.IsEnd) //褰撳墠璧风偣鍏ュ簱绔欏彴鐩存帴鍏ュ簱
{
string? targetLoca = _taskService.RequestAssignLocationByHeight(task.TaskNum, responseContent.Data.ToString(), conveyorLineInfoRead.Spare2);
if (!string.IsNullOrEmpty(targetLoca))
@@ -219,7 +259,8 @@
taskState = TaskStatusEnum.SC_Execute;
deviceCode = item.StackerCraneCode;
roadwayNo = responseContent.Data.ToString();
- device.SetValue(W_ConveyorLineDB.EndPos, task.CurrentAddress, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);
}
else
{
@@ -227,18 +268,68 @@
continue;
}
}
- else
+ else //鎹㈠贩閬撳垎閰嶅叾浠栧贩閬撶殑鍏ュ簱绔欏彴
{
- device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);
+ //task.NextAddress鍙兘鏄痳outer.NextPosi
+ roadwayNo = responseContent.Data.ToString();
+ deviceCode = router.ChildPosiDeviceCode;
+ currentAddress = router.StartPosi;
+ nextAddress= router.NextPosi;
+ device.SetValue(W_ConveyorLineDB.EndPos, router.NextPosi, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.StartPos, router.StartPosi, item.StationCode);
}
device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode);
- device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);
device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);
device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
- _taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress, targetAddress: targetAddress, deviceCode: deviceCode, roadwayNo: roadwayNo);
+ _taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress, targetAddress: targetAddress, deviceCode: deviceCode, roadwayNo: roadwayNo,heightType: conveyorLineInfoRead.Spare2);
}
- #endregion
+
}
+ if (taskIn!=null)
+ {
+ string currentAddress = taskIn.CurrentAddress;
+ string nextAddress = taskIn.NextAddress;
+ string targetAddress = taskIn.TargetAddress;
+ string deviceCode = taskIn.DeviceCode;
+ TaskStatusEnum taskState = (TaskStatusEnum)taskIn.TaskState;
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(item.StationCode, taskIn.Roadway, taskIn.TaskType);
+ Dt_Router? router = routers.FirstOrDefault();
+ if (routers == null || routers.Count == 0 || router == null)
+ {
+ WriteError(item.StationName, $"鏈壘鍒板搴旇矾鐢变俊鎭�,璁惧缂栧彿:{item.StationCode},浠诲姟鍙�:{taskIn.TaskNum}");
+ continue;
+ }
+ if (routers.Count > 1)
+ {
+ WriteError(item.StationName, $"璺敱淇℃伅閰嶇疆閿欒,璁惧缂栧彿:{item.StationCode},浠诲姟鍙�:{taskIn.TaskNum}");
+ continue;
+ }
+
+ if (router.IsEnd)
+ {
+ string? targetLoca = _taskService.RequestAssignLocationByHeight(taskIn.TaskNum, taskIn.Roadway, taskIn.HeightType);
+ if (!string.IsNullOrEmpty(targetLoca))
+ {
+ currentAddress = item.StackerCraneStationCode;
+ targetAddress = targetLoca;
+ nextAddress = targetLoca;
+ taskState = TaskStatusEnum.SC_Execute;
+ deviceCode = item.StackerCraneCode;
+ device.SetValue(W_ConveyorLineDB.EndPos, taskIn.CurrentAddress, item.StationCode);
+ }
+ else
+ {
+ WriteError(item.StationName, $"璇锋眰鍒嗛厤璐т綅澶辫触,璁惧缂栧彿:{item.StationCode},浠诲姟鍙�:{task.TaskNum}");
+ continue;
+ }
+ }
+ device.SetValue(W_ConveyorLineDB.TaskNum, taskIn.TaskNum, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.StartPos, taskIn.CurrentAddress, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);
+ device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
+ _taskService.UpdateTask(taskIn, taskState, currentAddress: currentAddress, nextAddress: nextAddress, targetAddress: targetAddress, deviceCode: deviceCode);
+ }
+ #endregion
}
}
else if (!conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && conveyorLineSignalWrite.ACK)
@@ -258,46 +349,12 @@
device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);
device.SetValue(W_ConveyorLineDB.STB, true, item.StationCode);
}
- //else
- //{
- // task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && string.IsNullOrEmpty(x.DeviceCode) && x.TaskState == TaskStatusEnum.New.ObjToInt() && x.WarehouseId == warehouseDevice.WarehouseId);
- // if (task != null)
- // {
- // Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == task.CurrentAddress);
- // if (stationManger != null)
- // {
- // _taskService.UpdateTask(task, TaskStatusEnum.SC_Execute, deviceCode: stationManger.StackerCraneCode, currentAddress: stationManger.StackerCraneStationCode, nextAddress: task.TargetAddress);
- // }
- // }
- //}
}
else if (!conveyorLineSignalRead.STB && conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && conveyorLineSignalWrite.STB && !conveyorLineSignalWrite.ACK)
{
device.SetValue(W_ConveyorLineDB.STB, false, item.StationCode);
}
}
- //else if (item.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt())
- //{
- // if (!conveyorLineSignalWrite.ACK && conveyorLineSignalRead.STB && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm)
- // {
- // if (conveyorLineInfoRead.TaskNum == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))//閫�鏂欏叆搴�
- // {
-
- // }
- // else//鍑哄簱瀹屾垚
- // {
-
- // }
- // }
- // else if (conveyorLineSignalWrite.STB && conveyorLineSignalRead.ACK && !conveyorLineStatus.Alarm)
- // {
- // device.SetValue(W_ConveyorLineDB.STB, false, item.StationCode);
- // }
- // else if (!conveyorLineSignalRead.STB && conveyorLineSignalWrite.ACK && !conveyorLineStatus.Alarm)
- // {
- // device.SetValue(W_ConveyorLineDB.ACK, false, item.StationCode);
- // }
- //}
}
else
{
--
Gitblit v1.9.3