From edc7293bf81729ebaa2d7cdd9a1f3aeaf567f538 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 31 十二月 2025 17:32:08 +0800
Subject: [PATCH] 更新
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 00d98e3..72fb24d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -1,7 +1,10 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics.CodeAnalysis;
using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.MaterielEnum;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Outbound;
@@ -59,13 +62,13 @@
}
/// <summary>
- /// 鎴愬搧绌烘鍥炲簱
+ /// 鎴愬搧绌烘墭鍥炲簱
/// </summary>
/// <param name="barCode"></param>
/// <param name="startPoint"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("EmptyBackTask"), AllowAnonymous]
- public WebResponseContent EmptyBackTask(string barCode, string startPoint)
+ public WebResponseContent EmptyBackTask(string barCode, string startPoint,int target)
{
return Service.EmptyBackTask(barCode, startPoint);
}
@@ -79,6 +82,17 @@
{
return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount,oneCount);
}
+
+ /// <summary>
+ /// 杈呮枡(鎴愬搧)閲囪喘/鏈熷垵鍏ュ簱
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("InboundOrderInTask"), AllowAnonymous]
+ public WebResponseContent InboundOrderInTask([NotNull] string bindCode, [NotNull] string barCode, [NotNull] string startPoint, int orderType = 0)
+ {
+ return Service.InboundOrderInTask(bindCode, barCode, startPoint, orderType);
+ }
+
/// <summary>
/// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
@@ -126,6 +140,17 @@
}
/// <summary>
+ /// 鍒涘缓鐢熺鎵嬪姩鍑哄簱
+ /// </summary>
+ /// <param name="ids"></param>
+ /// <returns></returns>
+ [HttpPost, Route("CreateSGManualTasks"), AllowAnonymous]
+ public WebResponseContent CreateSGManualTasks([FromBody] List<int> ids)
+ {
+ return Service.CreateSGManualTasks(ids);
+ }
+
+ /// <summary>
/// 淇敼浠诲姟鐘舵��
/// </summary>
/// <param name="task"></param>
@@ -165,9 +190,9 @@
/// <param name="palletCode">绾稿嵎鏉＄爜</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("PurchaseBoxing"), AllowAnonymous]
- public WebResponseContent PurchaseBoxing(string palletCode)
+ public WebResponseContent PurchaseBoxing(string palletCode, int orderType=0)
{
- return Service.PurchaseBoxing(palletCode);
+ return Service.PurchaseBoxing(palletCode, orderType);
}
/// <summary>
@@ -176,9 +201,9 @@
/// <param name="palletCode"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("AssignYLRoadwayNo"), AllowAnonymous]
- public WebResponseContent AssignYLRoadwayNo(string palletCode)
+ public WebResponseContent AssignYLRoadwayNo(string palletCode,int wide = 0, int thickness = 0, int weight = 0)
{
- string roadWay= Service.AssignYLRoadwayNo(palletCode);
+ string roadWay= Service.AssignYLRoadwayNo(palletCode, wide, thickness, wide);
if (string.IsNullOrEmpty(roadWay))
{
return WebResponseContent.Instance.Error("鏈壘鍒板彲鍒嗛厤宸烽亾");
@@ -226,13 +251,13 @@
}
/// <summary>
- /// 鍘熸枡绉诲簱浠诲姟
+ /// 绉诲簱浠诲姟
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("Relocation"), AllowAnonymous]
- public WebResponseContent IsRelocation(string startAddress, string endAddress, string roadWay)
+ public WebResponseContent IsRelocation([FromBody] RelocationDTO relocationDTO)
{
- return Service.IsRelocation(startAddress, endAddress, roadWay);
+ return Service.IsRelocation(relocationDTO);
}
/// <summary>
/// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
@@ -275,5 +300,31 @@
{
return Service.PrintInbound(saveModel);
}
+
+ /// <summary>
+ /// 绌烘墭鍙犵洏鍑哄簱
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PlateOutbound"), AllowAnonymous]
+ public WebResponseContent PlateOutbound(string stationCode)
+ {
+ return Service.PlateOutbound(stationCode);
+ }
+
+ /// <summary>
+ /// 鍚敤AGV绔欑偣
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("EnableStatus")]
+ public WebResponseContent EnableStatus([FromBody] int[] keys)
+ {
+ return Service.EnableStatus(keys);
+ }
+ [HttpPost, HttpGet, Route("DisableStatus")]
+ public WebResponseContent DisableStatus([FromBody] int[] keys)
+ {
+ return Service.DisableStatus(keys);
+ }
}
}
--
Gitblit v1.9.3