From 441b6f8d257a01b2998253ef0515a201777d7e68 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 04 七月 2025 14:06:49 +0800
Subject: [PATCH] 修改入库、移库、出库逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
index 8cfa2a4..08bf6b2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
@@ -7,6 +7,7 @@
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_DTO.WMSInfo;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
@@ -50,21 +51,27 @@
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
{
- List<Dt_Router> routers = _routerRepository.QueryData(x => x.StartPosi == task.TargetAddress && x.ChildPosiDeviceCode == "AGV" && x.Remark == "鏈崰鐢�");
- if (routers != null && routers.Count > 0)
- {
- var router = routers.FirstOrDefault();
- if (router != null)
- {
- task.TaskState = TaskOutStatusEnum.Line_OutFinish.ObjToInt();
- task.CurrentAddress = childDeviceCode;
- task.NextAddress = router.NextPosi;
- task.TargetAddress = task.NextAddress;
- router.Remark = "鍗犵敤";
- _routerRepository.UpdateData(router);
- _taskService.UpdateData(task);
- }
- }
+ #region MyRegion
+ //List<Dt_Router> routers = _routerRepository.QueryData(x => x.StartPosi == task.TargetAddress && x.ChildPosiDeviceCode == "AGV" && x.Remark == "鏈崰鐢�");
+ //if (routers != null && routers.Count > 0)
+ //{
+ // var router = routers.FirstOrDefault();
+ // if (router != null)
+ // {
+ // task.TaskState = TaskOutStatusEnum.Line_OutFinish.ObjToInt();
+ // task.CurrentAddress = childDeviceCode;
+ // task.NextAddress = router.NextPosi;
+ // task.TargetAddress = task.NextAddress;
+ // router.Remark = "鍗犵敤";
+ // _routerRepository.UpdateData(router);
+ // _taskService.UpdateData(task);
+ // }
+ //}
+ #endregion
+ task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
+ WMSTaskDTO WMStask = _mapper.Map<WMSTaskDTO>(task);
+ _taskService.AddTask_Hty(task, TaskOperateTypeEnum.AutoComplete);
+ HttpHelper.PostAsync(WMSInterfaceAddress.UpdateTaskStatus, WMStask.ToJson(), headers: new Dictionary<string, string>());
}
}
}
--
Gitblit v1.9.3