From b51a65433d6102f2f8f00226404d9ca3808404af Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 02 一月 2025 22:23:17 +0800
Subject: [PATCH] 打印托盘号
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
index 3f480c9..42a710a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
@@ -20,7 +20,7 @@
{
try
{
- var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.New.ObjToInt()).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
foreach (var agvTask in newTasks)
{
AgvTaskDTO taskDTO = new AgvTaskDTO()
@@ -40,14 +40,14 @@
positionCode=agvTask.NextAddress
}
},
- TaskCode = agvTask.TaskNum.ToString(),
- PodTyp = agvTask.PalletType == 1 ? "XX" : "DD",
+ TaskCode = agvTask.AgvTaskNum,
+ PodTyp = agvTask.PalletType < 3 ? "XX" : "DD",
};
WebResponseContent content = _taskService.AgvSendTask(taskDTO);
if (content.Status)
{
agvTask.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
- agvTask.Remark = content.Data.ObjToString();
+ //agvTask.Remark = content.Data.ObjToString();
}
else
{
@@ -76,7 +76,7 @@
AgvSecureReplyDTO replyDTO = new AgvSecureReplyDTO()
{
ReqCode = Guid.NewGuid().ToString().Replace("-", ""), //WaitToTask.TaskNum.ToString(),
- taskCode = WaitToTask.Remark,
+ taskCode = WaitToTask.AgvTaskNum,
};
WebResponseContent content = _taskService.AgvSecureReply(replyDTO);
if (content.Status)
@@ -101,11 +101,11 @@
{
switch (DeviceCode)
{
- case "SC01_CSJ":
+ case "AGV_CSJ":
{
return TaskType == TaskTypeEnum.ProductionReturn.ObjToInt() ? "23" : "24";
}
- case "SC01_ZH":
+ case "AGV_ZH":
{
if (TaskType == TaskTypeEnum.InboundXB.ObjToInt())
return "20";
--
Gitblit v1.9.3