From dfea94129c7d203aaaab8d0f6514aee74258e6a1 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 11 十二月 2024 16:49:00 +0800
Subject: [PATCH] 日志更新，回料移库入库区域
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 199 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 174 insertions(+), 25 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 52c7b45..545f443 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"
@@ -6,6 +6,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Eventing.Reader;
using System.Linq;
using System.Reflection.Metadata;
using System.Text;
@@ -142,20 +143,59 @@
if (targetCodes[4] == "02")
{
- task = OutTaskMovelibrary(task);
- if (task != null)
+ Dt_Task taskst = OutTaskMovelibrary(task);
+ if (taskst != null)
+ {
+ if(taskst.TaskType == (int)TaskRelocationTypeEnum.Relocation)
+ {
+ return taskst;
+ }
+ else
+ {
+ if(taskst.TargetAddress== "R02-001-021-001-02" || taskst.TargetAddress == "R02-001-022-001-02")
+ {
+ return taskst;
+ }
+ else
+ {
+ if (OutTaskStationIsOccupied(taskst) != null)
+ {
+ return taskst;
+ }
+ }
+
+ }
+
+ }
+ task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+ }
+ else
+ {
+ if (task.TargetAddress == "R02-001-021-001-02" || task.TargetAddress == "R02-001-022-001-02")
{
return task;
}
+ else
+ {
+ if (OutTaskStationIsOccupied(task) != null)
+ {
+ return task;
+ }
+ }
+
+ task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
}
- if (OutTaskStationIsOccupied(task) != null)
+
+
+ /*if (OutTaskStationIsOccupied(task) != null)
{
return task;
}
else
{
List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
- List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);
+
+ List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode);
foreach (var item in tasks)
{
if (OutTaskStationIsOccupied(task) != null)
@@ -164,9 +204,8 @@
}
}
//task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
- }
+ }*/
}
-
return task;
}
@@ -219,10 +258,10 @@
}
targetCodes[4] = "01";
string SourceAddress = string.Join("-", targetCodes); //缁勮娴呭簱浣嶅湴鍧�
- Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault();
+ Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault(); //鎵炬祬搴撲綅鏄惁鏈変换鍔�
if (tasks != null)
{
- return task;
+ return tasks;
}
else
{
@@ -247,7 +286,7 @@
if (Applyrelease(commonStackerCrane)) //璇诲彇鍫嗗灈鏈烘斁璐х敵璇�
{
Dt_Task task = _taskService.IngStackerCraneTask2(commonStackerCrane.DeviceCode);
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && (task.TargetAddress != "R02-001-021-001-02" && task.TargetAddress != "R02-001-022-001-02"))
{
IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceProDTOs.Exists(x => x.DeviceChildCode == task.TargetAddress));
if (device != null)
@@ -259,6 +298,7 @@
int B_Event_Test = GetLine(conveyorLine, deviceProDTO.DeviceProDataBlock); //鍒ゆ柇杈撻�佺嚎鏄惁鍏佽鏀捐揣淇″彿
if (B_Event_Test == 1)
{
+
if (Releasespermitted(commonStackerCrane, task.TargetAddress,true)) //鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊
{
WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鏀捐揣淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
@@ -286,7 +326,7 @@
else
{
Dt_Task task = _taskService.IngStackerCraneTask2(commonStackerCrane.DeviceCode);
- if (task !=null && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ if (task !=null && task.TaskType == (int)TaskOutboundTypeEnum.Outbound &&(task.TargetAddress != "R02-001-021-001-02" && task.TargetAddress != "R02-001-022-001-02"))
{
if (Completesignal(commonStackerCrane, task.TargetAddress)) //璇诲彇鍒版斁璐у畬鎴愪俊鍙�
{
@@ -294,7 +334,20 @@
if (device != null)
{
CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
- if (PLCSignal(conveyorLine, task.TargetAddress, 1)) //鍐欏叆杈撻�佺嚎 鍫嗗灈鏈烘斁璐� 淇″彿
+ if (task.TargetAddress == "R02-002-027-011-01" || task.TargetAddress == "R01-002-041-011-01") //鍐欏叆杈撻�佺嚎鍘诲悜
+ {
+ byte PLCtost = (byte)task.PLCTo;
+ if (PLCSignal2(conveyorLine, task.TargetAddress, "W_Destination", PLCtost))
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ幓鍚戞垚鍔燂紝鍘诲悜涓猴細{PLCtost}", $"鍑烘枡鍙ｅ幓鍚�");
+ }
+ else
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ幓鍚戝け璐ワ紝鍘诲悜涓猴細{PLCtost}", $"鍑烘枡鍙ｅ幓鍚�");
+ }
+ }
+
+ if (PLCSignal(conveyorLine, task.TargetAddress, (byte)1)) //鍐欏叆杈撻�佺嚎 鍫嗗灈鏈烘斁璐� 淇″彿
{
//璇诲彇杈撻�佺嚎鍙嶉 鍫嗗灈鏈烘斁涓嬩俊鍙�
DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.TargetAddress, "R_StackerCraneLowered"); //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
@@ -305,23 +358,86 @@
if (B_TAKE == 1)
{
- //鍫嗗灈鏈哄啓瀹屾垚
- if (Releasespermitted4(commonStackerCrane, task.TargetAddress, true))
+ if (task.TargetAddress == "R02-002-027-011-01" || task.TargetAddress == "R01-002-041-011-01")
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ DeviceProDTO? deviceProDTO3 = GetDeviceProDTO(conveyorLine, task.TargetAddress, "R_Destination");
+ if (deviceProDTO3 != null)
+ {
+ int PLCwcstost = GetLine(conveyorLine, deviceProDTO3.DeviceProDataBlock);
+ if (PLCwcstost == task.PLCTo)
+ {
+ byte PLCtost2 = 0;
+ if (PLCSignal2(conveyorLine, task.TargetAddress, "W_Destination", PLCtost2))
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭竻闄ゅ幓鍚戞垚鍔�", $"鍑烘枡鍙ｅ幓鍚�");
+
+ }
+ else
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭竻闄ゅ幓鍚戝け璐�", $"鍑烘枡鍙ｅ幓鍚�");
+ }
+ // 娓呴櫎杈撻�佺嚎
+ if (PLCSignal(conveyorLine, task.TargetAddress, (byte)0))
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�", $"鍑烘枡鍙ｅ幓鍚�");
+ }
+ else
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"鍑烘枡鍙ｅ幓鍚�");
+ }
+ //鍫嗗灈鏈哄啓瀹屾垚
+ if (Releasespermitted4(commonStackerCrane, task.TargetAddress, true))
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿鎴愬姛锛歵rue", $"鍑烘枡鍙ｅ幓鍚�");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿澶辫触:true", $"鍑烘枡鍙ｅ幓鍚�");
+ }
+
+ }
+ else
+ {
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬幓鍚戞瘮瀵逛笉涓�鑷达紝杈撻�佺嚎鍘诲悜涓猴細{PLCwcstost}锛寃cs鍐欏叆鍘诲悜涓猴細{task.PLCTo}", $"鍑烘枡鍙ｅ幓鍚�");
+ }
+ }
}
- else
+
+ if (task.TargetAddress != "R02-002-027-011-01" && task.TargetAddress != "R01-002-041-011-01")
{
- 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}");
+ }
+
+ //鍫嗗灈鏈哄啓瀹屾垚
+ if (Releasespermitted4(commonStackerCrane, task.TargetAddress, true))
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ }
+ else
+ {
+ WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿澶辫触:true", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ }
}
+
+
+ }
+ else
+ {
// 娓呴櫎杈撻�佺嚎
if (PLCSignal(conveyorLine, task.TargetAddress, 0))
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
}
else
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+ WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
}
}
}
@@ -511,7 +627,14 @@
{
return true;
}
-
+ }
+ DeviceProDTO? deviceProDTO6 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_A2in"); //绌烘墭鍑哄叆搴�
+ if (deviceProDTO6 != null)
+ {
+ if (GetStacker(commonStackerCrane, deviceProDTO6.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
return false;
@@ -546,7 +669,7 @@
if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
- if (Destinationaddress == "R01-003-041-011-01")
+ if (Destinationaddress == "R01-002-041-011-01")
{
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_Dout");
if (deviceProDTO != null)
@@ -561,6 +684,15 @@
if (deviceProDTO != null)
{
if(SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
+ }
+ }
+
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_A2in");
+ if (deviceProDTO != null)
+ {
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -628,7 +760,17 @@
}
}
}
-
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_A2in");
+ if (deviceProDTO != null)
+ {
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
+ }
+ }
return false;
}
@@ -646,7 +788,7 @@
}
if (Destinationaddress == "R02-002-027-011-01")
{
- DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_Din");
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_Dout");
if (deviceProDTO != null)
{
if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
@@ -669,7 +811,7 @@
if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
- if (Destinationaddress == "R01-002-043-001-01")
+ if (Destinationaddress == "R01-002-044-001-01")
{
DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_Aout");
if (deviceProDTO != null)
@@ -677,7 +819,14 @@
if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
-
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_A2in");
+ if (deviceProDTO != null)
+ {
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
+ }
+ }
return false;
}
@@ -977,7 +1126,7 @@
{
StackerCraneTaskCommand stackerCraneTaskCommand = new StackerCraneTaskCommand();
- stackerCraneTaskCommand.Barcode = task.PalletCode;
+ stackerCraneTaskCommand.Barcode = ""; /*task.PalletCode;*/
stackerCraneTaskCommand.TaskNum = task.TaskNum;
stackerCraneTaskCommand.WorkType = 1;
stackerCraneTaskCommand.TrayType = 0;
--
Gitblit v1.9.3