From 34188c3cfee5194a6a0d49b75013407838d9d81a Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 13 一月 2025 20:39:41 +0800
Subject: [PATCH] 板材仓
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/辅料仓/AGV_FLExtend.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\350\276\205\346\226\231\344\273\223/AGV_FLExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\350\276\205\346\226\231\344\273\223/AGV_FLExtend.cs"
index cbbc35f..4c97e00 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\350\276\205\346\226\231\344\273\223/AGV_FLExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\350\276\205\346\226\231\344\273\223/AGV_FLExtend.cs"
@@ -22,12 +22,12 @@
{
try
{
- var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && nameof(AGV_FLJob).Contains(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && nameof(AGV_FLJob).Contains(x.DeviceCode) && !string.IsNullOrEmpty(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
foreach (var task in newTasks)
{
try
{
- if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.OutEmpty.ObjToInt())
task.CurrentAddress = GetAGVAddress(task.CurrentAddress);
else
task.NextAddress = GetAGVAddress(task.NextAddress);
@@ -35,7 +35,7 @@
{
TaskCode = task.AgvTaskNum,
ReqCode = DateTime.Now.ToString("yyyyMMddHHmmss"),
- TaskTyp = task.TaskType == TaskTypeEnum.Outbound.ObjToInt() ? "FLC" : "FLR",
+ TaskTyp = task.TaskType < TaskTypeEnum.Inbound.ObjToInt() ? "FLC" : "FLR",
ctnrCode = task.PalletCode,
PositionCodePath = new List<CodePath>()
{
@@ -51,8 +51,8 @@
}
},
};
- //WebResponseContent content = _taskService.AgvSendTask(taskDTO, APIEnum.Agv_FLSendTask);
- //if (!content.Status) throw new Exception(content.Message);
+ WebResponseContent content = _taskService.AgvSendTask(taskDTO, APIEnum.Agv_FLSendTask);
+ if (!content.Status) throw new Exception(content.Message);
task.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
@@ -94,6 +94,7 @@
};
var b = Layer > 9 ? "" + Layer : "0" + Layer;
var c = Column > 9 ? "" + Column : "0" + Column;
+ if (Column == 10) c = "010";
Address = a + b + c;
}
else
--
Gitblit v1.9.3