From 8b3377273709a6abd89af0e5b2ff9618c167146e Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@hnkhzn.com>
Date: 星期二, 09 十二月 2025 17:20:24 +0800
Subject: [PATCH] 重写库存导出方法
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index b5c54e0..5b511f2 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -103,16 +103,8 @@
ConsoleHelper.WriteColorLine(builder, ConsoleColor.Blue);
commonStackerCrane.LastTaskType = task.TaskType;
- if(task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
- {
- task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
- _taskRepository.AddData(task);
- _taskService.StackCraneTaskCompleted(task.TaskNum);
- }
- else
- {
- _taskService.UpdateTaskStatusToNext(task.TaskNum);
- }
+
+ _taskService.UpdateTaskStatusToNext(task.TaskNum);
}
}
else
@@ -178,6 +170,24 @@
var task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
if (task == null) commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
+
+ if (commonStackerCrane.DeviceCode.Contains("CW") && task.TaskType==(int)TaskOutboundTypeEnum.InToOut)
+ {
+ var stationinfo = _stationManagerRepository.QueryFirst(x => (x.stationPLC == "1017"||x.stationPLC=="1024") && x.stationType == 10 && x.Roadway == commonStackerCrane.DeviceCode);
+
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationinfo.stationPLC);
+ if (device != null)
+ {
+ CommonConveyorLine_CW conveyorLine = (CommonConveyorLine_CW)device;
+ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, Convert.ToInt16(4000), stationinfo.stationChildCode);
+ Thread.Sleep(100);
+ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, 1000, stationinfo.stationChildCode);
+ }
+ WriteInfo(commonStackerCrane.DeviceName, $"銆愭墜鍔ㄥ嚭搴撹褰曘�戜换鍔″彿銆恵e.TaskNum}銆戞墭鐩樺彿銆恵task.PalletCode}銆�");
+ }
+
+
+
if (commonStackerCrane.DeviceCode.Contains("GW") && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
@@ -309,7 +319,7 @@
device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == router.ChildPosiDeviceCode);
if (device != null)
{
- CommonConveyorLine_GW conveyorLine = (CommonConveyorLine_GW)device;
+ CommonConveyorLine_CW conveyorLine = (CommonConveyorLine_CW)device;
if (conveyorLine.IsOccupied(task.NextAddress))//鍑哄簱绔欏彴鏈鍗犵敤
{
return task;
@@ -326,7 +336,9 @@
IDevice? device = null;
if (task.Roadway.Contains("GW"))
{
- device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1015");
+ string targetDeviceCode = task.Roadway == "GWSC3" ? "2025" : "1015";
+ device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == targetDeviceCode);
+
if (device != null)
{
CommonConveyorLine_GW conveyorLine = (CommonConveyorLine_GW)device;
--
Gitblit v1.9.3