From a3dfe45b801f14a574caf27effaed58f1dc3a763 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期二, 19 十一月 2024 23:42:39 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 384 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 245 insertions(+), 139 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 343e84a..52c7b45 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.AspNetCore.Components.Routing;
+锘縰sing Autofac.Core;
+using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Hosting;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using Quartz;
@@ -49,7 +50,7 @@
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
if (commonStackerCrane != null)
{
- //Signalinteraction(commonStackerCrane); //鍑哄簱淇″彿浜や簰
+ Signalinteraction(commonStackerCrane); //鍑哄簱淇″彿浜や簰
Siganlinteraction2(commonStackerCrane); //鍏ュ簱淇″彿浜や簰
if (!commonStackerCrane.IsEventSubscribed)
{
@@ -114,7 +115,7 @@
private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
{
Dt_Task task;
- if (commonStackerCrane.LastTaskType == null)
+ /*if (commonStackerCrane.LastTaskType == null)
{
task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
}
@@ -132,9 +133,10 @@
{
task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
}
- }
+ }*/
+ task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
- if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ if (task != null && task.TaskType== (int)TaskOutboundTypeEnum.Outbound)
{
string[] targetCodes = task.SourceAddress.Split("-");
if (targetCodes[4] == "02")
@@ -161,7 +163,7 @@
return task;
}
}
- task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+ //task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
}
}
@@ -183,7 +185,7 @@
if (deviceProDTO != null)
{
int B_Event_Test = GetLine(conveyorLine, deviceProDTO.DeviceProDataBlock); //鍒ゆ柇杈撻�佺嚎鏄惁鍏佽鏀捐揣淇″彿
- if (B_Event_Test == 0)
+ if (B_Event_Test == 1)
{
return task;
}
@@ -244,7 +246,7 @@
{
if (Applyrelease(commonStackerCrane)) //璇诲彇鍫嗗灈鏈烘斁璐х敵璇�
{
- Dt_Task task = _taskService.IngStackerCraneTask(commonStackerCrane.DeviceCode);
+ Dt_Task task = _taskService.IngStackerCraneTask2(commonStackerCrane.DeviceCode);
if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceProDTOs.Exists(x => x.DeviceChildCode == task.TargetAddress));
@@ -255,57 +257,84 @@
if (deviceProDTO != null)
{
int B_Event_Test = GetLine(conveyorLine, deviceProDTO.DeviceProDataBlock); //鍒ゆ柇杈撻�佺嚎鏄惁鍏佽鏀捐揣淇″彿
- if (B_Event_Test == 0)
+ if (B_Event_Test == 1)
{
- if (Releasespermitted(commonStackerCrane, task.TargetAddress)) //鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊
+ if (Releasespermitted(commonStackerCrane, task.TargetAddress,true)) //鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊
{
- LogSignalStatus("鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊鍙峰け璐�", task.TargetAddress);
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鏀捐揣淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鏀捐揣淇″彿澶辫触", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
}
}
else
{
- LogSignalStatus("鏈鍙栧埌杈撻�佺嚎鍏佽鏀捐揣淇″彿", task.TargetAddress);
+ if (Releasespermitted(commonStackerCrane, task.TargetAddress,false)) //鍐欏叆鍫嗗灈鏈轰笉鍏佽鏀捐揣淇�
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満涓嶅厑璁告斁璐т俊鍙锋垚鍔燂細false", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満涓嶅厑璁告斁璐т俊鍙峰け璐�", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ }
}
}
-
- if (Completesignal(commonStackerCrane, task.TargetAddress)) //璇诲彇鍒版斁璐у畬鎴愪俊鍙�
+ }
+ }
+ }
+ else
+ {
+ Dt_Task task = _taskService.IngStackerCraneTask2(commonStackerCrane.DeviceCode);
+ if (task !=null && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ {
+ if (Completesignal(commonStackerCrane, task.TargetAddress)) //璇诲彇鍒版斁璐у畬鎴愪俊鍙�
+ {
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceProDTOs.Exists(x => x.DeviceChildCode == task.TargetAddress));
+ if (device != null)
{
- if(PLCSignal(conveyorLine, task.TargetAddress, task.PalletCode, (byte)task.PalletCodequantity)) //鍐欏叆杈撻�佺嚎 鍫嗗灈鏈烘斁璐� 鎵樼洏鏉＄爜锛屽眰鏁帮紝绫诲瀷
+ CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+ if (PLCSignal(conveyorLine, task.TargetAddress, 1)) //鍐欏叆杈撻�佺嚎 鍫嗗灈鏈烘斁璐� 淇″彿
{
//璇诲彇杈撻�佺嚎鍙嶉 鍫嗗灈鏈烘斁涓嬩俊鍙�
- DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.SourceAddress, "R_StackerCraneLowered"); //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
- if (deviceProDTO != null)
+ DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.TargetAddress, "R_StackerCraneLowered"); //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
+ if (deviceProDTO2 != null)
{
- int B_TAKE = GetLine(conveyorLine, deviceProDTO.DeviceProDataBlock); //璇诲彇杈撻�佺嚎鐨� 鍫嗗灈鏈烘斁涓� 淇″彿
+ int B_TAKE = GetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock); //璇诲彇杈撻�佺嚎鐨� 鍫嗗灈鏈烘斁涓� 淇″彿
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氳鍙栧埌杈撻�佺嚎-鍫嗗灈鏈烘斁涓嬩俊鍙凤細{B_TAKE}", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+
if (B_TAKE == 1)
{
- //鍐欏叆缁欏爢鍨涙満锛岃緭閫佺嚎鐨� 鍫嗗灈鏈烘斁涓嬬‘璁� 淇″彿
- if (Releasespermitted4(commonStackerCrane, task.SourceAddress))
+ //鍫嗗灈鏈哄啓瀹屾垚
+ if (Releasespermitted4(commonStackerCrane, task.TargetAddress, true))
{
- LogSignalStatus("鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�", task.SourceAddress);
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
}
else
{
- LogSignalStatus("鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", task.SourceAddress);
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿澶辫触:true", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ }
+ // 娓呴櫎杈撻�佺嚎
+ if (PLCSignal(conveyorLine, task.TargetAddress, 0))
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
}
}
- else
- {
- LogSignalStatus("鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鏀句笅淇″彿", task.SourceAddress);
- }
}
-
-
}
else
{
- LogSignalStatus("鍐欏叆杈撻�佺嚎鍫嗗灈鏈烘斁璐� 鎵樼洏鏉＄爜锛屽眰鏁帮紝绫诲瀷澶辫触", task.TargetAddress);
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎0-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
}
}
- else
- {
- LogSignalStatus("鏈鍙栧埌鍫嗗灈鏈烘斁璐у畬鎴愪俊鍙�", task.TargetAddress);
- }
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒板爢鍨涙満鏀捐揣瀹屾垚淇″彿", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
}
}
}
@@ -326,48 +355,96 @@
int B_Event_Test = GetLine(conveyorLine, deviceProDTO.DeviceProDataBlock); //鍒ゆ柇杈撻�佺嚎鏄惁鍏佽鍙栬揣淇″彿
if (B_Event_Test == 1)
{
- if (Releasespermitted2(commonStackerCrane, task.SourceAddress)) //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
+ if (Releasespermitted2(commonStackerCrane, task.SourceAddress,true)) //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
{
- LogSignalStatus("鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙峰け璐�", task.SourceAddress);
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿澶辫触", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
}
}
else
{
- LogSignalStatus("鏈鍙栧埌杈撻�佺嚎鍏佽鍙栬揣淇″彿", task.SourceAddress);
+ if (Releasespermitted2(commonStackerCrane, task.SourceAddress,false)) //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿澶辫触", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
+
}
}
if (Completesignal2(commonStackerCrane, task.SourceAddress)) //璇诲彇鍫嗗灈鏈哄彇璐у畬鎴愪俊鍙�
{
- if(PLCSignal2(conveyorLine, task.SourceAddress, "W_StackerCranePicked")) //鍐欏叆杈撻�佺嚎鍙栬揣瀹屾垚淇″彿
+ if(PLCSignal2(conveyorLine, task.SourceAddress, "W_StackerCranePicked", 1)) //鍐欏叆杈撻�佺嚎鍙栬揣瀹屾垚淇″彿
{
DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.SourceAddress, "R_StackerCranePicked"); //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
if (deviceProDTO != null)
{
- int B_TAKE = GetLine(conveyorLine, deviceProDTO.DeviceProDataBlock); //璇诲彇杈撻�佺嚎鐨� 鍫嗗灈鏈哄彇璧� 淇″彿
+ int B_TAKE = GetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock); //璇诲彇杈撻�佺嚎鐨� 鍫嗗灈鏈哄彇璧� 淇″彿
if (B_TAKE == 1)
{
//鍐欏叆缁欏爢鍨涙満锛岃緭閫佺嚎鐨� 鍫嗗灈鏈哄彇璧� 淇″彿
- if(Releasespermitted3(commonStackerCrane, task.SourceAddress))
+ if(Releasespermitted3(commonStackerCrane, task.SourceAddress,true))
{
- LogSignalStatus("鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙锋垚鍔�", task.SourceAddress);
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
}
else
{
- LogSignalStatus("鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙峰け璐�", task.SourceAddress);
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
}
}
else
{
- LogSignalStatus("鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿", task.SourceAddress);
+ if (Releasespermitted3(commonStackerCrane, task.SourceAddress,false))
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
}
}
}
}
else
{
- LogSignalStatus("鏈鍙栧埌鍫嗗灈鏈烘斁璐у畬鎴愪俊鍙�", task.SourceAddress);
-
+ if (PLCSignal2(conveyorLine, task.SourceAddress, "W_StackerCranePicked", 0)) //鍐欏叆杈撻�佺嚎娓呴櫎淇″彿
+ {
+ DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.SourceAddress, "R_StackerCranePicked"); //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
+ if (deviceProDTO != null)
+ {
+ int B_TAKE = GetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock); //璇诲彇杈撻�佺嚎鐨� 鍫嗗灈鏈哄彇璧� 淇″彿
+ if (B_TAKE == 0)
+ {
+ //鍐欏叆缁欏爢鍨涙満锛岃緭閫佺嚎鐨� 鍫嗗灈鏈哄彇璧� 淇″彿
+ if (Releasespermitted3(commonStackerCrane, task.SourceAddress, false))
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
+ }
+ else
+ {
+ if (Releasespermitted3(commonStackerCrane, task.SourceAddress, false))
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ }
+ }
+ }
+ }
}
}
}
@@ -394,31 +471,47 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_Bout");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if(GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
DeviceProDTO? deviceProDTO2 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_Dout");
if (deviceProDTO2 != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO2.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO2.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
if (commonStackerCrane.DeviceCode == "SC01")
{
- DeviceProDTO? deviceProDTO3 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_Dout");
- if (deviceProDTO3 != null)
- {
- return GetStacker(commonStackerCrane, deviceProDTO3.DeviceProAddress);
- }
DeviceProDTO? deviceProDTO4 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_Cout");
if (deviceProDTO4 != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO4.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO4.DeviceProAddress).Status)
+ {
+ return true;
+ }
+ }
+ DeviceProDTO? deviceProDTO3 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_Dout");
+ if (deviceProDTO3 != null)
+ {
+ if (GetStacker(commonStackerCrane, deviceProDTO3.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
DeviceProDTO? deviceProDTO5 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_Aout");
if (deviceProDTO5 != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO5.DeviceProAddress);
+ if(GetStacker(commonStackerCrane, deviceProDTO5.DeviceProAddress).Status)
+ {
+ return true;
+ }
+
}
}
return false;
@@ -426,14 +519,14 @@
}
//鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊鍙�
- public bool Releasespermitted(CommonStackerCrane commonStackerCrane, string Destinationaddress)
+ public bool Releasespermitted(CommonStackerCrane commonStackerCrane, string Destinationaddress,bool SCcrane)
{
if (Destinationaddress == "R02-002-027-001-01")
{
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_Bout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if(SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R02-002-027-011-01")
@@ -441,7 +534,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_Dout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
//1鍙�
@@ -450,7 +543,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_Cout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R01-003-041-011-01")
@@ -458,7 +551,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_Dout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -467,7 +560,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_Aout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if(SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -482,7 +575,11 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_Bout");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if(GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
+
}
}
if (Destinationaddress == "R02-002-027-011-01")
@@ -490,7 +587,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_Dout");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
//1鍙�
@@ -499,7 +599,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_Cout");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
if (Destinationaddress == "R01-002-041-011-01")
@@ -507,7 +610,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_Dout");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
@@ -516,7 +622,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_Aout");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
@@ -525,14 +634,14 @@
}
//鍐欏叆鍫嗗灈鏈烘斁璐х‘璁や俊鍙�
- public bool Releasespermitted4(CommonStackerCrane commonStackerCrane, string Destinationaddress)
+ public bool Releasespermitted4(CommonStackerCrane commonStackerCrane, string Destinationaddress, bool SCcrane)
{
if (Destinationaddress == "R02-002-027-001-01")
{
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_Bout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R02-002-027-011-01")
@@ -540,7 +649,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_Din");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
//1鍙�
@@ -549,7 +658,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_Cout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R01-002-041-011-01")
@@ -557,7 +666,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_Dout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R01-002-043-001-01")
@@ -565,7 +674,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_Aout");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -574,14 +683,14 @@
//鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
- public bool Releasespermitted2(CommonStackerCrane commonStackerCrane, string Destinationaddress)
+ public bool Releasespermitted2(CommonStackerCrane commonStackerCrane, string Destinationaddress, bool SCcrane)
{
if (Destinationaddress == "R02-003-027-001-01")
{
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupRequest_Bin");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R02-003-027-011-01")
@@ -589,7 +698,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupRequest_Din");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
//1鍙�
@@ -598,7 +707,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupRequest_Cin");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R01-003-041-011-01")
@@ -606,7 +715,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupRequest_Din");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -615,7 +724,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupRequest_Ain");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R01-002-043-001-01")
@@ -623,7 +732,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupRequest_A2in");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -638,7 +747,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompleted_Bin");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
if (Destinationaddress == "R02-003-027-011-01")
@@ -646,7 +758,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompleted_Din");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
//1鍙�
@@ -655,7 +770,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompleted_Cin");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
if (Destinationaddress == "R01-003-041-011-01")
@@ -663,7 +781,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompleted_Din");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
@@ -672,7 +793,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompleted_Ain");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
@@ -681,7 +805,10 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompleted_A2in");
if (deviceProDTO != null)
{
- return GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress);
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
@@ -690,14 +817,14 @@
}
//鍐欏叆鍫嗗灈鏈哄彇璐х‘璁や俊鍙�
- public bool Releasespermitted3(CommonStackerCrane commonStackerCrane, string Destinationaddress)
+ public bool Releasespermitted3(CommonStackerCrane commonStackerCrane, string Destinationaddress, bool SCcrane)
{
if (Destinationaddress == "R02-003-027-001-01")
{
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompletion_Bin");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R02-003-027-011-01")
@@ -705,7 +832,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompletion_Din");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
//1鍙�
@@ -714,7 +841,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompletion_Cin");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R01-003-041-011-01")
@@ -722,7 +849,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompletion_Din");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -731,7 +858,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompletion_Ain");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
if (Destinationaddress == "R01-002-043-001-01")
@@ -739,7 +866,7 @@
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "PickupCompletion_A2in");
if (deviceProDTO != null)
{
- return SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, true);
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -748,62 +875,28 @@
//鍐欏叆杈撻�佺嚎鏀捐揣瀹屾垚淇″彿锛屾潯鐮侊紝灞傛暟锛岀被鍨�
- public bool PLCSignal(CommonConveyorLine conveyorLine,string TargetAddress,string PalletCode,byte PalletLayers)
+ public bool PLCSignal(CommonConveyorLine conveyorLine,string TargetAddress,byte staLow)
{
- byte PalletType = 2;
- if (TargetAddress == "R02-002-027-001-01" || TargetAddress == "R01-002-041-001-01")
- {
- PalletType = 1;
- }
-
//澶勭悊鍑哄簱鏀炬枡瀹屾垚鍚庨�昏緫
- try
+ DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, TargetAddress, "W_StackerCraneLowered"); //鏀捐揣瀹屾垚淇″彿
+ if (deviceProDTO2 != null)
{
- DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, TargetAddress, "W_StackerCraneLowered"); //鏀捐揣瀹屾垚淇″彿
- DeviceProDTO? deviceProDTO3 = GetDeviceProDTO(conveyorLine, TargetAddress, "W_PalletBarcode"); //鍐欏叆鏉＄爜
- DeviceProDTO? deviceProDTO4 = GetDeviceProDTO(conveyorLine, TargetAddress, "W_PalletLayers"); //灞傛暟
- DeviceProDTO? deviceProDTO5 = GetDeviceProDTO(conveyorLine, TargetAddress, "W_PalletType"); //绫诲瀷
- if(deviceProDTO2 !=null && deviceProDTO3 != null && deviceProDTO4 != null && deviceProDTO5 != null)
+ if (SetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock, staLow))
{
- if(SetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock, 1) && SetLinestring(conveyorLine, deviceProDTO3.DeviceProDataBlock,PalletCode) && SetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock, PalletLayers) && SetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock, PalletType))
- {
-
- LogSignalStatus($"鍐欏叆鏀捐揣瀹屾垚淇℃伅锛屾墭鐩樻潯鐮侊紝灞傛暟锛岀被鍨嬩俊鎭垚鍔�", TargetAddress);
- return true;
+ return true;
- }
- else
- {
- LogSignalStatus($"鍐欏叆鏀捐揣瀹屾垚淇℃伅锛屾墭鐩樻潯鐮侊紝灞傛暟锛岀被鍨嬩俊鎭け璐�", TargetAddress);
-
- }
}
- else
- {
- LogSignalStatus($"鏈壘鍒拌緭閫佺嚎鍗忚淇℃伅", TargetAddress);
-
- }
- }
- catch (Exception ex)
- {
- LogSignalStatus($"鍐欏叆澶辫触锛岄敊璇俊鎭細{ex.Message}", TargetAddress);
- throw;
}
return false;
}
//鍐欏叆杈撻�佺嚎 鍫嗗灈鏈哄彇璐у畬鎴愪俊鍙�
- public bool PLCSignal2(CommonConveyorLine conveyorLine, string SourceAddress,string DeviceProParamName)
+ public bool PLCSignal2(CommonConveyorLine conveyorLine, string SourceAddress,string DeviceProParamName,Byte stock)
{
DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, SourceAddress, DeviceProParamName); //鍙栬揣瀹屾垚淇″彿
if (deviceProDTO2 != null)
{
- return SetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock, 1);
- }
- else
- {
- LogSignalStatus($"鏈壘鍒拌緭閫佺嚎鍗忚淇℃伅", SourceAddress);
-
+ return SetLine(conveyorLine, deviceProDTO2.DeviceProDataBlock, stock);
}
return false;
}
@@ -841,9 +934,18 @@
/// <param name="conveyorLine"></param>
/// <param name="DeviceProDataBlock"></param>
/// <returns></returns>
- public bool GetStacker(CommonStackerCrane commonStackerCrane,string DeviceProDataBlock)
+ public WebResponseContent GetStacker(CommonStackerCrane commonStackerCrane,string DeviceProDataBlock)
{
- return commonStackerCrane.Communicator.Read<bool>(DeviceProDataBlock);
+ WebResponseContent content= new WebResponseContent();
+ if (commonStackerCrane.Communicator.Read<bool>(DeviceProDataBlock))
+ {
+ return content.OK();
+ }
+ else
+ {
+ return content.Error();
+ }
+
}
/// <summary>
@@ -852,9 +954,17 @@
/// <param name="conveyorLine"></param>
/// <param name="DeviceProDataBlock"></param>
/// <returns></returns>
- public bool SetStacker(CommonStackerCrane commonStackerCrane, string DeviceProDataBlock,bool Pali)
+ public WebResponseContent SetStacker(CommonStackerCrane commonStackerCrane, string DeviceProDataBlock,bool Pali)
{
- return commonStackerCrane.Communicator.Write(DeviceProDataBlock, Pali);
+ WebResponseContent content = new WebResponseContent();
+ if (commonStackerCrane.Communicator.Write(DeviceProDataBlock, Pali))
+ {
+ return content.OK();
+ }
+ else
+ {
+ return content.Error();
+ }
}
/// <summary>
@@ -959,10 +1069,6 @@
}
}
return stackerCraneTaskCommand;
- }
- private void LogSignalStatus(string message, string sourceAddress)
- {
- WriteLog.GetLog("鍫嗗灈鏈轰笌plc浜や簰淇″彿").Write($"绔欏彴缂栧彿锛歿sourceAddress},淇℃伅锛歿message}", $"{sourceAddress}");
}
}
}
--
Gitblit v1.9.3