From aefdecd0aa3226b7d00d1dc764241b82658b3be8 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 06 三月 2026 10:41:02 +0800
Subject: [PATCH] 添加机器人客户端；更新 WCS 缓存及任务
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 159 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 142 insertions(+), 17 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index e779cc8..5606824 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,13 +1,12 @@
锘縰sing AutoMapper;
-using Microsoft.AspNetCore.Components.Forms;
using SqlSugar;
using System.Text.Json;
using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
@@ -48,6 +47,8 @@
_httpClientHelper = httpClientHelper;
}
+ #region WCS閫昏緫澶勭悊
+
/// <summary>
/// 鍒涘缓浠诲姟锛堢粍鐩樺叆搴撲换鍔°�佺┖鎵樼洏鍥炲簱浠诲姟锛�
/// </summary>
@@ -55,27 +56,39 @@
{
try
{
+ WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+ if (content.Status)
+ {
+ return content;
+ }
+
if (string.IsNullOrWhiteSpace(taskDto.PalletCode) ||
- string.IsNullOrWhiteSpace(taskDto.SourceAddress) ||
- string.IsNullOrWhiteSpace(taskDto.TargetAddress) ||
string.IsNullOrWhiteSpace(taskDto.Roadway))
{
- return WebResponseContent.Instance.Error("Invalid task details.");
+ return WebResponseContent.Instance.Error("鏃犳晥鐨勪换鍔¤鎯�");
}
if (taskDto.TaskType != TaskTypeEnum.Inbound && taskDto.TaskType != TaskTypeEnum.InEmpty)
{
- return WebResponseContent.Instance.Error("Invalid task details.");
+ return WebResponseContent.Instance.Error("鏃犳晥鐨勪换鍔¤鎯�");
}
+
+ // 浣跨敤 switch 琛ㄨ揪寮忔槧灏勪换鍔＄被鍨�
+ int taskInboundType = taskDto.TaskType switch
+ {
+ TaskTypeEnum.Inbound => TaskInboundTypeEnum.Inbound.GetHashCode(),
+ TaskTypeEnum.InEmpty => TaskInboundTypeEnum.InEmpty.GetHashCode(),
+ _ => 0 // 鐞嗚涓婁笉浼氳蛋鍒拌繖閲岋紝鍥犱负宸茬粡楠岃瘉杩囦簡
+ };
var task = new Dt_Task
{
- TaskNum = 0,
+ TaskNum = await BaseDal.GetTaskNo(),
PalletCode = taskDto.PalletCode,
PalletType = taskDto.PalletType,
Roadway = taskDto.Roadway,
- TaskType = taskDto.TaskType.GetHashCode(),
- TaskStatus = TaskStatusEnum.New.GetHashCode(),
+ TaskType = taskInboundType,
+ TaskStatus = TaskInStatusEnum.InNew.GetHashCode(),
SourceAddress = taskDto.SourceAddress,
TargetAddress = taskDto.TargetAddress,
CurrentAddress = taskDto.SourceAddress,
@@ -96,7 +109,6 @@
return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
}
}
-
/// <summary>
/// 鏍规嵁鎸囧畾鐨勪换鍔¤鎯呭紓姝ュ垱寤烘柊鐨勫嚭搴撲换鍔�
@@ -128,14 +140,13 @@
var result = await BaseDal.AddDataAsync(taskList) > 0;
var wmstaskDto = result ? _mapper.Map<WMSTaskDTO>(taskList) : null;
- return WebResponseContent.Instance.OK(result ? "浠诲姟鍒涘缓鎴愬姛" : "浠诲姟鍒涘缓澶辫触", wmstaskDto);
+ return WebResponseContent.Instance.OK(result ? "浠诲姟鍒涘缓鎴愬姛" : "浠诲姟鍒涘缓澶辫触", wmstaskDto ?? new object());
}
catch (Exception ex)
{
return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
}
}
-
/// <summary>
/// 鑾峰彇鍙叆搴撹揣浣�
@@ -151,9 +162,9 @@
if (locationInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
locationInfo.LocationStatus = LocationStatusEnum.FreeLock.GetHashCode();
- task.CurrentAddress = taskDto.SourceAddress;
+ task.CurrentAddress = task.SourceAddress;
task.NextAddress = locationInfo.LocationCode;
- task.TargetAddress = taskDto.TargetAddress;
+ task.TargetAddress = locationInfo.LocationCode;
task.TaskStatus = TaskStatusEnum.Line_Finish.GetHashCode();
var updateResult = await BaseDal.UpdateDataAsync(task);
@@ -250,6 +261,121 @@
return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
}
}
+
+ /// <summary>
+ /// 鍒涘缓绌烘墭鐩樺叆搴撲换鍔�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> CreateTaskInboundTrayAsync(CreateTaskDto taskDto)
+ {
+ try
+ {
+ WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+ if (content.Status)
+ {
+ return content;
+ }
+
+ //var tasks = await BaseDal.QueryAsync(s => s.PalletCode == palletCode);
+ //if (tasks == null || !tasks.Any())
+ // return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+ //var taskDtos = _mapper.Map<List<WMSTaskDTO>>(tasks);
+ return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛"/*, taskDtos*/);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 鍒涘缓绌烘墭鐩樺嚭搴撲换鍔�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> GetOutBoundTrayTaskAsync(CreateTaskDto taskDto)
+ {
+ try
+ {
+
+ var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => x.LocationDetails.WarehouseId == taskDto.WarehouseId && x.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode() && x.StockStatus == StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode());
+ if (stockInfo == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
+
+ var task = new Dt_Task()
+ {
+ WarehouseId = stockInfo.LocationDetails.WarehouseId,
+ PalletCode = stockInfo.PalletCode,
+ PalletType = stockInfo.PalletType,
+ SourceAddress = stockInfo.LocationCode,
+ CurrentAddress = stockInfo.LocationCode,
+ NextAddress = taskDto.TargetAddress,
+ TargetAddress = taskDto.TargetAddress,
+ Roadway = stockInfo.LocationDetails.RoadwayNo,
+ TaskType = TaskTypeEnum.OutEmpty.GetHashCode(),
+ TaskStatus = TaskStatusEnum.New.GetHashCode(),
+ Grade = 1,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "system",
+ };
+ var taskDtos = _mapper.Map<List<WMSTaskDTO>>(task);
+ return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 淇敼浠诲姟鐘舵�侊紙鏍规嵁浠诲姟ID淇敼涓烘寚瀹氱姸鎬侊級
+ /// </summary>
+ /// <param name="taskId"></param>
+ /// <param name="newStatus"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> UpdateTaskByStatusAsync(int taskId, int newStatus)
+ {
+ try
+ {
+ var tasks = await BaseDal.QueryFirstAsync(s => s.TaskId == taskId);
+ if (tasks == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+
+ tasks.TaskStatus = newStatus;
+ await BaseDal.UpdateDataAsync(tasks);
+
+ return WebResponseContent.Instance.OK("淇敼鎴愬姛", tasks);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"淇敼澶辫触: {ex.Message}");
+ }
+ }
+
+
+ /// <summary>
+ /// 鏌ユ壘鎵樼洏鏄惁鏈変换鍔�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ private async Task<WebResponseContent> GetTasksByPalletCodeAsync(string palletCode)
+ {
+ try
+ {
+ var tasks = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
+ if (tasks == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+ var taskDtos = _mapper.Map<List<WMSTaskDTO>>(tasks);
+ return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ #endregion WCS閫昏緫澶勭悊
#region 鍒嗗鏌滄帴鍙�
@@ -378,7 +504,6 @@
var result = await BaseDal.AddDataAsync(taskList) > 0;
var wmstaskDto = result ? _mapper.Map<WMSTaskDTO>(taskList) : null;
-
var httpResponse = _httpClientHelper.Post<WebResponseContent>("http://logistics-service/api/logistics/notifyoutbound", JsonSerializer.Serialize(wmstaskDto)).Data;
if (result && httpResponse != null)
{
@@ -433,6 +558,6 @@
}
}
- #endregion
+ #endregion 鍒嗗鏌滄帴鍙�
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3