From e46aa927d231af83724683c7286d9db503e24cf7 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期二, 10 六月 2025 11:46:20 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index c5188d0..4ac9304 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -1,10 +1,12 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
+锘縰sing System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_DTO.BasicInfo;
using WIDESEAWCS_IBasicInfoService;
+using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -16,10 +18,13 @@
{
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IOrderDetailsService _orderDetailsService;
- public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor,IOrderDetailsService orderDetailsService) : base(service)
+ private readonly ITaskRepository _taskRepository;
+
+ public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IOrderDetailsService orderDetailsService, ITaskRepository taskRepository) : base(service)
{
_httpContextAccessor = httpContextAccessor;
_orderDetailsService = orderDetailsService;
+ _taskRepository = taskRepository;
}
[HttpPost, HttpGet, Route("CreateTask"), AllowAnonymous]
@@ -38,7 +43,23 @@
public Dt_Task GenerateTask(string barcode)
{
OrderInfo orderInfo = _orderDetailsService.GetOrderInfoByBarcode(barcode);
- return Service.GenerateTask(orderInfo);
+
+ var (flag, task, message) = Service.GenerateTask(orderInfo);
+ if (flag && task != null)
+ return task;
+ else
+ return new Dt_Task();
+ }
+
+ [HttpPost, HttpGet, Route("TaskComplete"), AllowAnonymous]
+ public WebResponseContent TaskComplete(int taskNum)
+ {
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板搴斾换鍔′俊鎭�");
+ }
+ return Service.TaskComplete(task);
}
}
}
--
Gitblit v1.9.3