From 011ca316e6ec2ed93e31c45a9ebd9d3c66664871 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 四月 2026 11:47:03 +0800
Subject: [PATCH] 代码更新
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 93 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 83 insertions(+), 10 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 43844a5..f9fd92f 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"
@@ -30,12 +30,11 @@
/// WCS鐢宠鍏ュ簱浠诲姟(涓嶅垎閰嶈揣浣�)
/// </summary>
/// <param name="stationCode"></param>
- /// <param name="palletCode"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("DeviceRequestInboundTaskSimple"), AllowAnonymous]
- public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode)
+ public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode)
{
- return Service.DeviceRequestInboundTaskSimple(stationCode, palletCode);
+ return Service.DeviceRequestInboundTaskSimple(stationCode);
}
/// <summary>
@@ -68,9 +67,9 @@
/// <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);
+ return Service.EmptyBackTask(barCode, startPoint, target);
}
/// <summary>
@@ -82,6 +81,7 @@
{
return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount,oneCount);
}
+
/// <summary>
/// 杈呮枡(鎴愬搧)閲囪喘/鏈熷垵鍏ュ簱
/// </summary>
@@ -139,6 +139,26 @@
}
/// <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="ids"></param>
+ /// <returns></returns>
+ [HttpPost, Route("CreateSGManualTasks"), AllowAnonymous]
+ public WebResponseContent CreateProDeliveryTasks([FromBody] List<int> ids)
+ {
+ return Service.CreateProDeliveryTasks(ids);
+ }
+ /// <summary>
/// 淇敼浠诲姟鐘舵��
/// </summary>
/// <param name="task"></param>
@@ -189,9 +209,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("鏈壘鍒板彲鍒嗛厤宸烽亾");
@@ -239,13 +259,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>
/// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
@@ -288,5 +308,58 @@
{
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);
+ }
+ /// <summary>
+ /// 鎴愬搧缁勭洏
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("BoxingInBound"), AllowAnonymous]
+ public WebResponseContent BoxingInBound(string stationCode, [FromBody] List<string> barCodes)
+ {
+ return Service.BoxingInBound(stationCode, barCodes);
+ }
+ /// <summary>
+ /// 鎴愬搧鍏ュ簱鎵爜璇锋眰鏇存柊鎵樼洏鏉＄爜
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("InBoundPalletCode"), AllowAnonymous]
+ public WebResponseContent InBoundPalletCode(int taskNum, string barCode)
+ {
+ return Service.InBoundPalletCode(taskNum, barCode);
+ }
+ /// <summary>
+ /// 鍗婃垚鍝佹墭鐩樻惉杩愬叆搴�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("SemiProIn"), AllowAnonymous]
+ public WebResponseContent SemiProIn(string barcode, string palletCode, string address)
+ {
+ return Service.SemiProIn(barcode, palletCode, address);
+ }
}
}
--
Gitblit v1.9.3