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/ConveyorLineJob_NewCW/CommonConveyorLine_NewCWJob.cs | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_NewCW/CommonConveyorLine_NewCWJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_NewCW/CommonConveyorLine_NewCWJob.cs
index ba36c83..993d276 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_NewCW/CommonConveyorLine_NewCWJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_NewCW/CommonConveyorLine_NewCWJob.cs
@@ -147,7 +147,6 @@
MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);
if (method != null)
{
- //var strings = platform.Location.Split(',').ToList();
int count = 1;
method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
}
@@ -453,6 +452,21 @@
conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
content = _taskService.UpdateTaskStatusToNext(task);
}
+
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode && x.stationArea == "Call" && x.stationType == 12);
+ CommonConveyorLine_BZ? commonConveyorBZ = Storage.Devices.FirstOrDefault(x => x.DeviceCode == station.stationPLC) as CommonConveyorLine_BZ;
+ if (commonConveyorBZ != null)
+ {
+ ConveyorLineTaskCommand_After readSignal = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(station.stationLocation);
+ if (readSignal.Reserved5 == 1)
+ {
+ var tasks = _taskRepository.QueryData(x => x.TargetAddress == childDeviceCode);
+ if (tasks.Count == 0)
+ {
+ commonConveyorBZ.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), station.stationLocation);
+ }
+ }
+ }
}
else
{
@@ -482,9 +496,6 @@
_needBarcodeRepository.UpdateData(needBarcode);
}
}
-
- //conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
if (sendFlag)
{
@@ -493,6 +504,21 @@
taskNext.ExceptionMessage = log;
content = _taskService.UpdateTaskStatusToNext(taskNext);
}
+
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode && x.stationArea == "Call" && x.stationType == 12);
+ CommonConveyorLine_BZ? commonConveyorBZ = Storage.Devices.FirstOrDefault(x => x.DeviceCode == station.stationPLC) as CommonConveyorLine_BZ;
+ if (commonConveyorBZ != null)
+ {
+ ConveyorLineTaskCommand_After readSignal = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(station.stationLocation);
+ if (readSignal.Reserved5 == 1)
+ {
+ var tasks = _taskRepository.QueryData(x => x.TargetAddress == childDeviceCode);
+ if (tasks.Count == 0)
+ {
+ commonConveyorBZ.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), station.stationLocation);
+ }
+ }
+ }
}
}
}
--
Gitblit v1.9.3