From 959aa7cefa8f416452444160cdd4edbea2cadae7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 07 十一月 2024 16:53:45 +0800
Subject: [PATCH] 合并冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 100 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 40 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 20a3264..70f9860 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -192,6 +192,28 @@
}
/// <summary>
+ /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
+ /// </summary>
+ /// <param name="deviceNo">璁惧缂栧彿</param>
+ /// <param name="currentAddress">褰撳墠鍦板潃</param>
+ /// <returns></returns>
+ public Dt_Task QueryNextConveyorLineTask(string deviceNo, string currentAddress)
+ {
+ return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.NextAddress == currentAddress, TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
+ /// </summary>
+ /// <param name="Barcode">鎵樼洏鍙�</param>
+ /// <param name="currentAddress">褰撳墠鍦板潃</param>
+ /// <returns></returns>
+ public Dt_Task QueryBarCodeConveyorLineTask(string Barcode, string currentAddress)
+ {
+ return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress && x.PalletCode == Barcode, TaskOrderBy);
+ }
+
+ /// <summary>
/// 鏍规嵁浠诲姟鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
@@ -397,36 +419,46 @@
if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
{
- Random random = new Random();
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = $"{random.Next(1, 1).ToString().PadLeft(3, '0')}-{random.Next(1, 1).ToString().PadLeft(3, '0')}-{random.Next(1, 1).ToString().PadLeft(3, '0')}";
- task.TargetAddress = task.NextAddress;
+ //if (task.Roadway.Contains("CH"))
+ //{
+ // Random random = new Random();
+ // task.CurrentAddress = task.NextAddress;
+ // task.NextAddress = $"{random.Next(1, 1).ToString().PadLeft(3, '0')}-{random.Next(0, 0).ToString().PadLeft(3, '0')}-{random.Next(1, 1).ToString().PadLeft(3, '0')}";
+ // task.TargetAddress = task.NextAddress;
+ //}
+ //else
+ //{
+ // Random random = new Random();
+ // task.CurrentAddress = task.NextAddress;
+ // task.NextAddress = "002-020-001";
+ // task.TargetAddress = task.NextAddress;
+ //}
#region 鐪熷疄鏁版嵁
// TODO: 璋冪敤鎺ュ彛鑾峰彇涓嬩竴涓湴鍧�
- //// 鍒涘缓璇锋眰瀵硅薄
- //RequestTaskDto request = new RequestTaskDto()
- //{
- // Position = task.NextAddress,
- // PalletCode = task.PalletCode,
- //};
+ // 鍒涘缓璇锋眰瀵硅薄
+ RequestTaskDto request = new RequestTaskDto()
+ {
+ Position = task.NextAddress,
+ PalletCode = task.PalletCode,
+ };
- //// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
- //var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", request.ToJsonString()).Result;
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", request.ToJsonString()).Result;
- //// 鍙嶅簭鍒楀寲鍝嶅簲鍐呭
- //content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ // 鍙嶅簭鍒楀寲鍝嶅簲鍐呭
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
- //// 妫�鏌ョ姸鎬佸苟杩斿洖
- //if (!content.Status)
- // return content;
+ // 妫�鏌ョ姸鎬佸苟杩斿洖
+ if (!content.Status)
+ return content;
- //// 鍙嶅簭鍒楀寲浠诲姟鏁版嵁
- //WMSTaskDTO taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
+ // 鍙嶅簭鍒楀寲浠诲姟鏁版嵁
+ WMSTaskDTO taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
- //task.CurrentAddress = task.NextAddress;
- //task.NextAddress = taskResult.TargetAddress;
- //task.TargetAddress = task.NextAddress;
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = taskResult.TargetAddress;
+ task.TargetAddress = task.NextAddress;
#endregion
}
@@ -524,7 +556,7 @@
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
{
- //todo
+ //todo 鍚屾鍒癢MS
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
task.TaskState = nextStatus;
task.ModifyDate = DateTime.Now;
@@ -533,24 +565,12 @@
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
- //var x = new { taskNum = taskNum };
- //var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result;
- //content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ #region WMS鍚屾浠诲姟瀹屾垚
+ var x = new { taskNum = taskNum };
+ var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result;
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ #endregion
- //WMSTaskDTO taskDTO = new WMSTaskDTO()
- //{
- // TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
- // Grade = 1,
- // PalletCode = task.PalletCode + "S",
- // RoadWay = "SC01",
- // SourceAddress = task.TargetAddress,
- // TargetAddress = "CLOutAreaA",
- // TaskState = (int)TaskOutStatusEnum.OutNew,
- // Id = 0,
- // TaskType = (int)TaskOutboundTypeEnum.Outbound
- //};
-
- //content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
{
--
Gitblit v1.9.3