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 | 201 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 150 insertions(+), 51 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 fa01688..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"
@@ -1,9 +1,13 @@
锘縰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;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -26,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>
@@ -45,17 +48,28 @@
{
return Service.AssignInboundTaskLocation(taskNum, roadwayNo);
}
-
+
/// <summary>
- /// 鎴愬搧绌烘鍥炲簱
+ /// 鍚慦MS鐢宠鍑哄簱AGV缁堢偣
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("AssignOutTargetAddress"), AllowAnonymous]
+ public WebResponseContent AssignOutTargetAddress(int taskNum)
+ {
+ return Service.AssignOutTargetAddress(taskNum);
+ }
+
+ /// <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);
+ return Service.EmptyBackTask(barCode, startPoint, target);
}
/// <summary>
@@ -63,10 +77,21 @@
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("InboundFLTask"), AllowAnonymous]
- public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount)
+ public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount, int oneCount)
{
- return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount);
+ 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>
/// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
@@ -74,11 +99,11 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <param name="locationCode"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
- public WebResponseContent IsRelocation(int taskNum, string locationCode)
- {
- return Service.IsRelocation(taskNum, locationCode);
- }
+ //[HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
+ //public WebResponseContent IsRelocation(int taskNum, string locationCode)
+ //{
+ // return Service.IsRelocation(taskNum, locationCode);
+ //}
/// <summary>
/// 浠诲姟瀹屾垚
@@ -104,16 +129,35 @@
}
/// <summary>
- /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
+ /// 閫夋嫨搴撳瓨鐢熸垚鑰佸巶鍑哄簱浠诲姟
/// </summary>
- /// <param name="id"></param>
/// <returns></returns>
- [HttpPost, Route("Outbound"), AllowAnonymous]
- public WebResponseContent Outbound(int id)
+ [HttpPost, Route("OldYLOutbound"), AllowAnonymous]
+ public WebResponseContent Outbound([FromBody] List<int> ids)
{
- return Service.Outbound(id);
+ return Service.Outbound(ids);
}
+ /// <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>
@@ -143,9 +187,20 @@
/// <param name="palletCode">鏉＄爜</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("YLPurchaseBoxing"), AllowAnonymous]
- public WebResponseContent YLPurchaseBoxing(string palletCode)
+ public WebResponseContent YLPurchaseBoxing(string palletCode,decimal weight=0,decimal thickness = 0, decimal wide = 0, string stationCode = "")
{
- return Service.YLPurchaseBoxing(palletCode);
+ return Service.YLPurchaseBoxing(palletCode,weight,thickness,wide,stationCode);
+ }
+
+ /// <summary>
+ /// 鍘熸枡閲囪喘缁戝畾RFID
+ /// </summary>
+ /// <param name="palletCode">绾稿嵎鏉＄爜</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PurchaseBoxing"), AllowAnonymous]
+ public WebResponseContent PurchaseBoxing(string palletCode, int orderType=0)
+ {
+ return Service.PurchaseBoxing(palletCode, orderType);
}
/// <summary>
@@ -154,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("鏈壘鍒板彲鍒嗛厤宸烽亾");
@@ -167,50 +222,50 @@
/// <summary>
/// 鎴愬搧鍑哄簱浠诲姟璇锋眰
/// <param name="targetId">
- /// 1 鏈堝彴鍖�<br/>
- /// 2 鍏ュ簱鍖�<br/>
- /// 3 缁囧竷鍖�<br/>
- /// 4 娣嬭啘鍖�<br/>
- /// 5 鏆傚瓨鍖�<br/>
- /// 6 鍗板埛鍖�<br/>
- /// 7 鍐插垏鍖�<br/>
- /// 8 鍘熸枡鍖�<br/>
- /// 9 绾歌鍖�<br/>
- /// 10 甯冭鍖�<br/>
- /// 11 绾告澂鍖�<br/>
- /// 12 闆惧寲鍖�<br/>
+ ///涓�妤兼湀鍙扮爜澶� = 1,
+ ///涓�妤兼棤绾虹粐甯� = 2,
+ ///涓�妤兼棤绾烘穻鑶� = 3,
+ ///涓�妤兼棤绾虹紦瀛� = 4,
+ ///涓�妤肩焊寮犳穻鑶� = 5,
+ ///涓�妤煎嵃鍒� = 6,
+ ///涓�妤煎垎鍒� = 7,
+ ///涓�妤兼ā鍒� = 8,
+ ///涓�妤煎啿鍒� = 9,
+ ///涓�妤煎師鏂� = 10,
+ ///涓�妤兼垚鍝� = 11,
+ ///浜屾ゼ鍘熸枡 = 12,
+ ///浜屾ゼ鎴愬搧 = 13,
+ ///浜屾ゼ鏃犵汉甯冭 = 14,
+ ///浜屾ゼ绾歌 = 15,
+ ///浜屾ゼ绾告澂 = 16,
+ ///浜屾ゼ闆惧寲 = 17
/// </param>
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("RequestCPWMSTaskOut"), AllowAnonymous]
- public WebResponseContent RequestCPWMSTaskOut(string materialCode,int Count, int targetId)
+ public WebResponseContent RequestCPWMSTaskOut(string materialCode,int outCount, string targetId)
{
- return Service.RequestCPWMSTaskOut(materialCode, Count, targetId);
+ return Service.RequestCPWMSTaskOut(materialCode, outCount, targetId);
}
/// <summary>
/// 鍘熸枡鍑哄簱浠诲姟
/// </summary>
- /// <param name="materielCode">鐗╂枡浠ｇ爜</param>
- /// <param name="materielWide">鐗╂枡骞呭</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("RequestYLWMSTaskOut"), AllowAnonymous]
- public WebResponseContent RequestYLWMSTaskOut(string materielCode,int materielWide, int count,string address="")
+ public WebResponseContent RequestYLWMSTaskOut([FromBody] YLWMSTaskOutDTO yLWMSTaskOutDTO)
{
- return Service.RequestYLWMSTaskOut(materielCode, materielWide, count, address);
+ return Service.RequestYLWMSTaskOut(yLWMSTaskOutDTO);
}
/// <summary>
- /// 鍘熸枡绉诲簱浠诲姟
+ /// 绉诲簱浠诲姟
/// </summary>
- /// <param name="startAddress"></param>
- /// <param name="endAddress"></param>
- /// <param name="roadWay"></param>
/// <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>
/// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
@@ -255,12 +310,56 @@
}
/// <summary>
- /// 鍒涘缓鍘熺焊鐢熶骇鎺掔▼鍑哄簱浠诲姟
+ /// 绌烘墭鍙犵洏鍑哄簱
/// </summary>
- [HttpPost, HttpGet, Route("CreateBSTOutboundTasks"), AllowAnonymous]
- public WebResponseContent CreateBSTOutboundTasks([FromBody] int[] keys)
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PlateOutbound"), AllowAnonymous]
+ public WebResponseContent PlateOutbound(string stationCode)
{
- return Service.CreateBSTOutboundTasks(keys);
+ 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