From 1e6a3ce80c38124fe8750f59956528204e696d4e Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期三, 22 四月 2026 15:13:25 +0800
Subject: [PATCH] 新功能
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs"
index 505838b..c0e0ecf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs"
@@ -46,6 +46,7 @@
{
try
{
+ Thread.Sleep(3000);
//杩炴帴鍫嗗灈鏈�
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
if (commonStackerCrane != null)
@@ -114,7 +115,7 @@
//鍒ゆ柇鏄惁涓鸿嚜鍔ㄦā寮�
if (R_ControlMode == 2 && R_TaskStatus == 2 && R_LoadStatus != 2 && (R_TaskPhases == 0 || R_TaskPhases == 5))
{
- Thread.Sleep(3000);
+ WriteInfo("鍫嗗灈鏈轰俊鍙�", $"{R_ControlMode+"||"+ R_TaskStatus + "||"+R_LoadStatus+"||"+R_TaskPhases}");
//鍒ゆ柇鏄惁鏈夋墽琛屼腑鐨勪换鍔�
Dt_Task tasking = _taskRepository.QueryFirst(x => (x.TaskState == (int)TaskStatusEnum.InNew && x.TaskState == (int)TaskStatusEnum.OutNew) || x.TaskState == (int)TaskStatusEnum.Task_Put || x.TaskState == (int)TaskStatusEnum.Task_fetch);
if (tasking == null)
@@ -177,9 +178,9 @@
{
Dt_Task task;
task = _TaskService.TaskInorOut(InorOuts);
- //婊℃《鍑哄簱
if (task != null)
{
+ //婊℃《鍑哄簱
if (task.TaskType == (int)TaskTypeEnum.Outfull)
{
int pick = comm.GETR_PickD();
@@ -190,6 +191,18 @@
return null;
}
WriteInfo("鍫嗗灈鏈烘墽琛屾弧妗跺嚭搴撲换鍔★細", $"{"杈撻�佺嚎鍑哄簱淇″彿姝ｅ父" + pick + "//" + status}");
+ }
+ //绌烘《鍑哄簱
+ else if(task.TaskType == (int)TaskTypeEnum.OutEmpty)
+ {
+ int pick = comm.GETR_PickB();
+ int status = comm.GETR_StatusB();
+ if (pick != 1 || status != 1)
+ {
+ WriteInfo("鍫嗗灈鏈烘墽琛岀┖妗跺嚭搴撲换鍔★細", $"{"杈撻�佺嚎鍑哄簱淇″彿寮傚父" + pick + "//" + status}");
+ return null;
+ }
+ WriteInfo("鍫嗗灈鏈烘墽琛岀┖妗跺嚭搴撲换鍔★細", $"{"杈撻�佺嚎鍑哄簱淇″彿姝ｅ父" + pick + "//" + status}");
}
}
@@ -241,7 +254,7 @@
stackerCraneCommand.W_OrderNo = task.TaskNum;
}
//鍑哄簱
- else if (task.TaskType == (int)TaskTypeEnum.OutEmpty || task.TaskType == (int)TaskTypeEnum.Outfull)
+ else if (task.TaskType == (int)TaskTypeEnum.OutDirect || task.TaskType == (int)TaskTypeEnum.OutEmpty || task.TaskType == (int)TaskTypeEnum.Outfull)
{
stackerCraneCommand.W_SourceRow = (short)int.Parse(SourceAddress[0]);
stackerCraneCommand.W_SourceColumn = (short)int.Parse(SourceAddress[1]);
--
Gitblit v1.9.3