From 0500b9903e5b7fcdbdc5b3bd0cc9b373779d64d8 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 13 三月 2026 12:47:10 +0800
Subject: [PATCH] feat: implement DB region (Data Blocks)
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 248 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 162 insertions(+), 86 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 7ae869a..710e2d3 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -18,6 +18,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using Newtonsoft.Json;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Text.Json;
@@ -29,6 +30,7 @@
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core.Http;
+using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.Stock;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ITaskInfoRepository;
@@ -92,24 +94,24 @@
task.Creater = "WMS";
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
- List<Dt_Router> routers = _routerService.QueryNextRoutes(item.RoadWay, item.TargetAddress);
+ Dt_Router router = _routerService.QueryNextRoute(item.RoadWay, item.TargetAddress,item.TaskType);
//鏆備笉鑰冭檻澶氳矾寰�
- if (routers.Count > 0)
+ if (router !=null )
{
task.TaskState = (int)TaskOutStatusEnum.OutNew;
task.CurrentAddress = item.SourceAddress;
- task.NextAddress = routers.FirstOrDefault().ChildPosi;
+ task.NextAddress = router.ChildPosi;
}
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
{
- List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);
+ Dt_Router routers = _routerService.QueryNextRoute(item.SourceAddress);
//鏆備笉鑰冭檻澶氳矾寰�
- if (routers.Count > 0)
+ if (!routers.IsNullOrEmpty())
{
task.TaskState = (int)TaskInStatusEnum.InNew;
task.CurrentAddress = item.SourceAddress;
- task.NextAddress = routers.FirstOrDefault().ChildPosi;
+ task.NextAddress = routers.ChildPosi;
}
}
tasks.Add(task);
@@ -118,7 +120,7 @@
_taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskNum).ToList(), "鎺ユ敹WMS浠诲姟");
- content = WebResponseContent.Instance.OK("鎴愬姛");
+ content = WebResponseContent.Instance.OK("鎴愬姛", tasks);
}
catch (Exception ex)
{
@@ -179,6 +181,9 @@
/// <returns></returns>
public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress)
{
+ if (string.IsNullOrEmpty(nextAddress))
+ throw new ArgumentNullException(nameof(nextAddress), "涓嬩竴鍦板潃涓嶈兘涓虹┖");
+
return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
}
@@ -190,6 +195,9 @@
/// <returns></returns>
public Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress)
{
+ if (string.IsNullOrEmpty(currentAddress))
+ throw new ArgumentNullException(nameof(currentAddress), "褰撳墠鍦板潃涓嶈兘涓虹┖");
+
return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish), TaskOrderBy);
}
@@ -273,6 +281,9 @@
WebResponseContent content = new WebResponseContent();
try
{
+ if (string.IsNullOrEmpty(message))
+ throw new ArgumentNullException(nameof(message), "寮傚父淇℃伅涓嶈兘涓虹┖");
+
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
@@ -339,89 +350,149 @@
/// <returns></returns>
public WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task)
{
- WebResponseContent content = new WebResponseContent();
- try
+ int oldState = task.TaskState;
+
+ var result = task.TaskType.GetTaskTypeGroup() switch
{
- int oldState = task.TaskState;
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish)
- {
- return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- }
+ TaskTypeGroup.OutbondGroup => ProcessOutboundTaskStatus(task),
+ TaskTypeGroup.InboundGroup => ProcessInboundTaskStatus(task),
+ TaskTypeGroup.OtherGroup => ProcessRobotTaskStatus(task),
+ _ => WebResponseContent.Instance.Error($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�")
+ };
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
+ if (!result.Status)
+ return result;
- task.TaskState = nextStatus;
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
- {
- if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
- {
- return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- }
+ // 鏇存柊浠诲姟鏁版嵁
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ BaseDal.UpdateData(task);
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
- task.TaskState = nextStatus;
+ // 璁板綍浠诲姟鎵ц璇︽儏
+ string logMessage = App.User.UserId > 0
+ ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�"
+ : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�";
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, logMessage);
- if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
- {
- // 璋冪敤WMS绯荤粺鎺ュ彛锛岃幏鍙栨渶缁堢洰鏍囧湴鍧�
- CreateTaskDto taskDto = new CreateTaskDto()
- {
- PalletCode = task.PalletCode,
- };
- var result = _httpClientHelper.Post<WebResponseContent>("WMS", taskDto.ToJson(), nameof(ConfigKey.GetTasksLocation));
- if (!result.IsSuccess && !result.Data.Status)
- {
- return WebResponseContent.Instance.Error($"璋冪敤WMS鎺ュ彛鑾峰彇浠诲姟鐩爣鍦板潃澶辫触,浠诲姟鍙�:銆恵task.TaskNum}銆�,閿欒淇℃伅:銆恵content.Message}銆�");
- }
+ return WebResponseContent.Instance.OK();
+ }
- string wmsTargetAddress = result.Data.Data?.ToString() ?? string.Empty;
- if (string.IsNullOrEmpty(wmsTargetAddress))
- {
- return WebResponseContent.Instance.Error($"璋冪敤WMS鎺ュ彛鑾峰彇浠诲姟鐩爣鍦板潃澶辫触,浠诲姟鍙�:銆恵task.TaskNum}銆�,閿欒淇℃伅:銆愭湭鑾峰彇鍒版湁鏁堢殑鐩爣鍦板潃銆�");
- }
+ /// <summary>
+ /// 澶勭悊鍑哄簱浠诲姟鐘舵�佽浆鎹�
+ /// </summary>
+ private WebResponseContent ProcessOutboundTaskStatus(Dt_Task task)
+ {
+ if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish)
+ return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- task.NextAddress = wmsTargetAddress;
- task.TargetAddress = wmsTargetAddress;
- task.CurrentAddress = task.NextAddress;
- }
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup)
- {
- if (task.TaskState >= (int)TaskRobotStatusEnum.RobotNew)
- {
- return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- }
+ task.TaskState = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskRobotStatusEnum>();
+ if (task.TaskState <= 0)
+ return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- task.TaskState = nextStatus;
- }
- else
- {
- throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
- }
-
- if (task.TaskState <= 0)
- {
- return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- }
-
- task.ModifyDate = DateTime.Now;
- task.Modifier = "System";
- BaseDal.UpdateData(task);
-
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
-
- content = WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
+ // 鏍规嵁鐘舵�佽皟鐢ㄤ笉鍚岀殑WMS鎺ュ彛
+ if (task.TaskState == (int)TaskOutStatusEnum.Line_OutFinish)
{
- content = WebResponseContent.Instance.Error(ex.Message);
+ return NotifyWMSOutboundFinish(task);
}
- return content;
+ else
+ {
+ return UpdateWMSTaskStatus(task);
+ }
+ }
+
+ /// <summary>
+ /// 澶勭悊鍏ュ簱浠诲姟鐘舵�佽浆鎹�
+ /// </summary>
+ private WebResponseContent ProcessInboundTaskStatus(Dt_Task task)
+ {
+ if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
+ return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+
+ task.TaskState = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
+
+ if (task.TaskState <= 0)
+ return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+
+ // 鏍规嵁鐘舵�佽皟鐢ㄤ笉鍚岀殑WMS鎺ュ彛
+ if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
+ {
+ return GetWMSInboundLocation(task);
+ }
+ else
+ {
+ return UpdateWMSTaskStatus(task);
+ }
+ }
+
+ /// <summary>
+ /// 澶勭悊鏈烘鎵嬩换鍔＄姸鎬佽浆鎹�
+ /// </summary>
+ private WebResponseContent ProcessRobotTaskStatus(Dt_Task task)
+ {
+ if (task.TaskState >= (int)TaskRobotStatusEnum.RobotFinish)
+ return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+
+ task.TaskState = task.TaskState.GetNextNotCompletedStatus<TaskRobotStatusEnum>();
+
+ if (task.TaskState <= 0)
+ return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+
+ return WebResponseContent.Instance.OK();
+ }
+
+ /// <summary>
+ /// 閫氱煡WMS绯荤粺鍑哄簱瀹屾垚
+ /// </summary>
+ private WebResponseContent NotifyWMSOutboundFinish(Dt_Task task)
+ {
+ var result = _httpClientHelper.Post<WebResponseContent>(
+ nameof(ConfigKey.OutboundFinishTaskAsync),
+ new StockInfoDTO { PalletCode = task.PalletCode, TaskNum = task.TaskNum }.ToJson());
+
+ if (!result.IsSuccess || !result.Data.Status)
+ return WebResponseContent.Instance.Error($"閫氱煡WMS绯荤粺鍫嗗灈鏈哄嚭搴撳畬鎴愬け璐�,浠诲姟鍙�:銆恵task.TaskNum}銆�,鎵樼洏鍙�:銆恵task.PalletCode}銆�,閿欒淇℃伅:銆恵result.Data?.Message}銆�");
+
+ return WebResponseContent.Instance.OK();
+ }
+
+ /// <summary>
+ /// 浠嶹MS绯荤粺鑾峰彇鍏ュ簱鐩爣鍦板潃
+ /// </summary>
+ private WebResponseContent GetWMSInboundLocation(Dt_Task task)
+ {
+ var result = _httpClientHelper.Post<WebResponseContent>(
+ nameof(ConfigKey.GetTasksLocation),
+ new CreateTaskDto { PalletCode = task.PalletCode }.ToJson());
+
+ if (!result.IsSuccess || !result.Data.Status)
+ return WebResponseContent.Instance.Error($"璋冪敤WMS鎺ュ彛鑾峰彇浠诲姟鐩爣鍦板潃澶辫触,浠诲姟鍙�:銆恵task.TaskNum}銆�,閿欒淇℃伅:銆恵result.Data?.Message}銆�");
+
+ var nextAddress = result.Data.Data?.ToString();
+ if (string.IsNullOrEmpty(nextAddress))
+ return WebResponseContent.Instance.Error($"璋冪敤WMS鎺ュ彛鑾峰彇浠诲姟鐩爣鍦板潃澶辫触,浠诲姟鍙�:銆恵task.TaskNum}銆�,閿欒淇℃伅:銆愭湭鑾峰彇鍒版湁鏁堢殑鐩爣鍦板潃銆�");
+
+ task.CurrentAddress = task.NextAddress;
+
+ task.NextAddress = nextAddress;
+ task.TargetAddress = nextAddress;
+
+ return WebResponseContent.Instance.OK();
+ }
+
+ /// <summary>
+ /// 鏇存柊WMS绯荤粺浠诲姟鐘舵��
+ /// </summary>
+ private WebResponseContent UpdateWMSTaskStatus(Dt_Task task)
+ {
+ var result = _httpClientHelper.Post<WebResponseContent>(
+ nameof(ConfigKey.UpdateTaskByStatus),
+ new UpdateTaskDto { Id = task.TaskNum, NewStatus = task.TaskState }.ToJson());
+
+ if (!result.IsSuccess || !result.Data.Status)
+ return WebResponseContent.Instance.Error($"璋冪敤WMS鎺ュ彛鏇存柊浠诲姟鐘舵�佸け璐�,浠诲姟鍙�:銆恵task.TaskNum}銆�,閿欒淇℃伅:銆恵result.Data?.Message}銆�");
+
+ return WebResponseContent.Instance.OK();
}
/// <summary>
@@ -434,6 +505,9 @@
{
try
{
+ if (string.IsNullOrEmpty(currentAddress))
+ throw new ArgumentNullException(nameof(currentAddress), "褰撳墠鍦板潃涓嶈兘涓虹┖");
+
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress);
if (task == null) throw new Exception($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
@@ -455,6 +529,7 @@
}
catch (Exception ex)
{
+ Console.WriteLine($"UpdatePosition 鏇存柊浠诲姟浣嶇疆澶辫触,浠诲姟鍙�:銆恵taskNum}銆�,閿欒淇℃伅:銆恵ex.Message}銆�");
}
return null;
}
@@ -483,13 +558,13 @@
task.NextAddress = routers.FirstOrDefault().ChildPosi;
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
- BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
-
- var result = _httpClientHelper.Post<WebResponseContent>("WMS", (new StockInfoDTO() { PalletCode = task.PalletCode, TaskNum = task.TaskNum }).ToJson());
+ var result = _httpClientHelper.Post<WebResponseContent>(nameof(ConfigKey.OutboundFinishTaskAsync), (new StockInfoDTO() { PalletCode = task.PalletCode, TaskNum = task.TaskNum }).ToJson());
if (result.IsSuccess && result.Data.Status)
{
+ BaseDal.UpdateData(task);
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
return content.Error($"閫氱煡WMS绯荤粺鍫嗗灈鏈哄嚭搴撳畬鎴愭垚鍔�,浠诲姟鍙�:銆恵task.TaskNum}銆�,鎵樼洏鍙�:銆恵task.PalletCode}銆�");
}
@@ -504,17 +579,18 @@
task.TaskState = nextStatus;
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
- BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
- var result = _httpClientHelper.Post<WebResponseContent>("WMS", (new CreateTaskDto()
+
+ var result = _httpClientHelper.Post<WebResponseContent>(nameof(ConfigKey.InboundFinishTaskAsync), (new CreateTaskDto()
{
PalletCode = task.PalletCode,
}).ToJson());
if (result.IsSuccess && result.Data.Status)
{
+ BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
return content.Error($"閫氱煡WMS绯荤粺鍫嗗灈鏈哄叆搴撳畬鎴愭垚鍔�,浠诲姟鍙�:銆恵task.TaskNum}銆�,鎵樼洏鍙�:銆恵task.PalletCode}銆�");
}
else
--
Gitblit v1.9.3