From 681d093f9ea16ab2d480d77e6b04b197e506ff60 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 19 六月 2025 01:29:12 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 c06132e..b727fc4 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"
@@ -51,12 +51,12 @@
if (task != null)
{
bool sendFlag = true;
- if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt())
- {
- //鍚慦MS鐢宠鍑哄叆搴撳彛鏄惁鏈夌┖鎵樼洏
- sendFlag = false;
- }
- if(sendFlag)
+ //if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt())
+ //{
+ // //鍚慦MS鐢宠鍑哄叆搴撳彛鏄惁鏈夌┖鎵樼洏
+ // sendFlag = false;
+ //}
+ if (sendFlag)
{
StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
if (stackerCraneTaskCommand != null)
@@ -107,12 +107,18 @@
private Dt_Task? GetTask(SpeStackerCrane speStackerCrane)
{
Dt_Task? task;
+ string DeviceCode = speStackerCrane.DeviceCode.Contains("CP") ? "CP" : "FL";
if (speStackerCrane.LastTaskType == null)
{
- task = _taskService.QueryStackerCraneTask(speStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerCraneTask(DeviceCode);
}
else
{
+ if (speStackerCrane.LastTaskType == TaskTypeEnum.Relocation.ObjToInt())
+ {
+ task = _taskService.QueryStackerCraneTask(DeviceCode);
+ if (task != null) return task;
+ }
bool flag = speStackerCrane.LastTaskType == TaskTypeEnum.Inbound.ObjToInt() || speStackerCrane.LastTaskType == TaskTypeEnum.PalletInbound.ObjToInt();
if (flag == false)
{
--
Gitblit v1.9.3