From 675f3f475a61dd0ad8ffb76e183baa9b78f14f45 Mon Sep 17 00:00:00 2001
From: renmingwang <renmingwang@hnkhzn.com>
Date: 星期一, 30 三月 2026 16:46:31 +0800
Subject: [PATCH] 修改任务下发
---
/dev/null | 170 --------------------------------------------------------
项目代码/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js | 2
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 5 +
3 files changed, 4 insertions(+), 173 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
index bed2931..8f16fbf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
@@ -76,7 +76,7 @@
// PalletCode: param
// }
this.http
- .get("api/Task/WCSTask?task=${task}")
+ .get(`/api/Task/WCSTask?task=${task}`)
.then((x) => {
if (x.status) {
this.$Message.success('浠诲姟鎵嬪姩涓嬪彂鎴愬姛.');
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 533db2b..bf86e18 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -1030,9 +1030,9 @@
}
}
//鎵嬪姩涓嬪彂浠诲姟鍒癢CS
- public WebResponseContent WCSTask(int task)
+ public WebResponseContent WCSTask([FromQuery] int task)
{
- List<Dt_Task> AddtaskList = BaseDal.QueryData(x => x.TaskNum == task);
+ List<Dt_Task> AddtaskList = BaseDal.QueryData(x => x.TaskNum == task);
if (!AddtaskList.Any())
{
@@ -1043,6 +1043,7 @@
//return WebResponseContent.Instance.OK();
}
+
public ApiResponse<object> TaskFeedback(TaskNotification taskFeedback)
{
throw new NotImplementedException();
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/ToMes.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/ToMes.cs"
deleted file mode 100644
index 0135bc6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/ToMes.cs"
+++ /dev/null
@@ -1,170 +0,0 @@
-using Autofac.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Common.Log;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.ToMes;
-using WIDESEA_ITaskInfoService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers
-{
-
- /// <summary>
- /// 涓婃父鎺ュ彛
- /// </summary>
- [Route("v1/pallet/rmsPalletTask")]
- [ApiController]
- public class ToMes : ApiBaseController<ITaskService, Dt_Task>
- {
- public ToMes(ITaskService service) : base(service)
- {
- }
- /// <summary>
- /// MES涓嬪彂鍑哄簱浠诲姟
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("sendExTask"), AllowAnonymous]
- public ApiResponse<object> sendExTask([FromBody] InOutboundTaskReceived outbound)
- {
- ApiResponse<object> api = Service.sendExTask(outbound);
- if (api.Success == false)
- {
- WriteLog.Write_Log("MES涓嬪彂浠诲姟", "MES涓嬪彂鍑哄簱浠诲姟", $"浠诲姟鐢熸垚澶辫触鍘熷洜{api.Message}", outbound);
-
- }
- else
- {
- WriteLog.Write_Log("MES涓嬪彂浠诲姟", "MES涓嬪彂鍑哄簱浠诲姟", $"浠诲姟鐢熸垚鎴愬姛", outbound);
-
- }
- return api;
- }
-
- /// <summary>
- /// MES涓嬪彂鍏ュ簱浠诲姟
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("sendEnTask"), AllowAnonymous]
- public ApiResponse<object> sendEnTask([FromBody] InOutboundTaskReceived outbound)
- {
- ApiResponse<object> api = Service.sendEnTask(outbound);
- if (api.Success == false)
- {
- WriteLog.Write_Log("MES涓嬪彂浠诲姟", "MES涓嬪彂鍏ュ簱浠诲姟", $"浠诲姟鐢熸垚澶辫触鍘熷洜{api.Message}", outbound);
-
- }
- else
- {
- WriteLog.Write_Log("MES涓嬪彂浠诲姟", "MES涓嬪彂鍏ュ簱浠诲姟", $"浠诲姟鐢熸垚鎴愬姛", outbound);
-
- }
- return api;
- }
-
-
- /// <summary>
- /// 鏂板缓璐т綅
- /// </summary>
- [HttpPost, HttpGet, Route("createLocation"), AllowAnonymous]
- public ApiResponse<object> createLocation([FromBody] List<LocationInfoDto> locationInfo)
- {
- return Service.createLocation(locationInfo);
- }
-
- /// <summary>
- /// 淇敼璐т綅
- /// </summary>
- [HttpPost, HttpGet, Route("updateLocation"), AllowAnonymous]
- public ApiResponse<object> updateLocation([FromBody] LocationInfoDto locationInfo)
- {
- return Service.updateLocation(locationInfo);
- }
-
- /// <summary>
- /// 鍒犻櫎璐т綅
- /// </summary>
- [HttpPost, HttpGet, Route("deleteLocation"), AllowAnonymous]
- public ApiResponse<object> deleteLocation([FromBody] List<string> locationCode)
- {
- return Service.deleteLocation(locationCode);
- }
-
- /// <summary>
- /// MES涓嬪彂搴撲綅璋冩嫧浠诲姟
- /// </summary>
- /// <param name="allocationTask">搴撲綅璋冩嫧浠诲姟淇℃伅</param>
- /// <returns></returns>
- [HttpPost, Route("onHandMove"), AllowAnonymous]
- public ApiResponse<object> sendAllocationTask([FromBody] AllocationTaskReceived allocationTask)
- {
- return Service.sendAllocationTask(allocationTask);
- }
-
-
-
-
-
-
-
- /// <summary>
- /// 鎵樼洏浠诲姟鏁版嵁浼犺緭瀵硅薄
- /// 鐢ㄤ簬鍐呴儴涓氬姟鏁版嵁浼犺緭
- /// </summary>
- public class PalletTaskDTO
- {
- /// <summary>
- /// 涓氬姟ID
- /// </summary>
- public string BusinessId { get; set; }
-
- /// <summary>
- /// 浠诲姟ID
- /// </summary>
- public string TaskId { get; set; }
-
- /// <summary>
- /// 鎵樼洏缂栫爜
- /// </summary>
- public string PalletCode { get; set; }
-
- }
-
-
- /// <summary>
- /// MES鍙栨秷浠诲姟鎺ュ彛
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
- [HttpPost, Route("cancelTask"), AllowAnonymous]
- public ApiResponse<object> Cancelinventory([FromBody] PalletTaskDTO palletTaskDTO)
- {
- return Service.Cancelinventory(palletTaskDTO.PalletCode);
- }
-
- /// <summary>
- /// MES鎵嬪姩浠诲姟瀹屾垚
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- [HttpPost, Route("mockComplete"), AllowAnonymous]
- public WebResponseContent ManualTaskCompleted([FromBody] PalletTaskDTO palletTaskDTO)
- {
- return Service.ManualTaskCompleted(palletTaskDTO.PalletCode);
- }
-
- /// <summary>
- /// MES浠诲姟缁撴灉鍙嶉鎺ュ彛
- /// </summary>
- /// <param name="taskFeedback"></param>
- /// <returns></returns>
- [HttpPost, Route("resultReport"), AllowAnonymous]
- public ApiResponse<object> TaskFeedback([FromBody] TaskNotification taskFeedback)
- {
- return Service.TaskFeedback(taskFeedback);
- }
- }
-}
--
Gitblit v1.9.3