From 40ef2cb3dd897dfc74d9576d0973517b24cc9367 Mon Sep 17 00:00:00 2001
From: 陈勇 <竞男@ASUNA>
Date: 星期二, 17 三月 2026 11:21:56 +0800
Subject: [PATCH] 同步
---
项目代码/WCS/WCSServer/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 1926cad..d74066f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -73,8 +73,8 @@
if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Online) //鍦ㄧ嚎
&& commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Free) //绌洪棽
&& !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Alarm) //鏃犳姤璀�
- && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Goods) //杞借揣鍙版棤璐�
- && commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Flag) //璐у弶鍚敤
+ && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.ForkGoods) //杞借揣鍙版棤璐�
+ && commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.ForkFlag) //璐у弶鍚敤
)
{
commonStackerCrane.CheckStackerCraneTaskCompleted();//闃叉浠诲姟瀹屾垚浜嬩欢鐩戞祴瓒呮椂锛屽啀鎵嬪姩瑙﹀彂涓�娆�
@@ -87,7 +87,7 @@
StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
if (stackerCraneTaskCommand != null)
{
- var taskNum = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.CurrentTaskNum);
+ var taskNum = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.TaskNum);
//var taskBarCode = commonStackerCrane.GetValue<StackerCraneDBName, string>(StackerCraneDBName.Barcode);
ConsoleHelper.WriteColorLine($"銆恵commonStackerCrane.DeviceName}銆戝爢鍨涙満浠诲姟鍙凤細銆恵taskNum}銆戜换鍔′换鍔″彿锛氥�恵task.TaskNum}銆�", ConsoleColor.DarkBlue);
if (taskNum == 0)
@@ -184,7 +184,7 @@
{
var content = _taskService.StackCraneTaskCompleted(e.TaskNum);
- var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 2);
+ var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.CMD, 2);
str = $"銆恵commonStackerCrane.DeviceName}銆慦MS|WCS浠诲姟瀹屾垚锛氥�恵content.Status}銆�,鍫嗗灈鏈哄畬鎴愪俊鍙峰啓鍏ワ細銆恵isWorkType}銆�,浠诲姟鍙凤細銆恵e.TaskNum}銆戞椂闂淬�恵DateTime.Now}銆�";
WriteInfo(commonStackerCrane.DeviceName, str);
ConsoleHelper.WriteColorLine(str, ConsoleColor.Blue);
@@ -269,15 +269,15 @@
task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
}
- if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
- {
- var relocation = _taskService.InBeforeCheck(task.TaskNum);
+ //if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ //{
+ // var relocation = _taskService.InBeforeCheck(task.TaskNum);
- if (relocation != null)
- {
- return relocation;
- }
- }
+ // if (relocation != null)
+ // {
+ // return relocation;
+ // }
+ //}
return task;
}
--
Gitblit v1.9.3