From da4257bc32483409af02a06dd342c6981ec786ec Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期一, 17 十一月 2025 17:14:14 +0800
Subject: [PATCH] 更新大屏幕页面和任务信息页面
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 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 c4bf576..43844a5 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;
@@ -47,7 +51,18 @@
}
/// <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>
@@ -67,6 +82,16 @@
{
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>
/// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
@@ -142,21 +167,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>
- /// <param name="rfidCode">绾稿嵎RIFD</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>
@@ -207,13 +231,11 @@
/// <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>
@@ -265,15 +287,6 @@
public WebResponseContent PrintInbound([FromBody] SaveModel saveModel)
{
return Service.PrintInbound(saveModel);
- }
-
- /// <summary>
- /// 鍒涘缓鍘熺焊鐢熶骇鎺掔▼鍑哄簱浠诲姟
- /// </summary>
- [HttpPost, HttpGet, Route("CreateBSTOutboundTasks"), AllowAnonymous]
- public WebResponseContent CreateBSTOutboundTasks([FromBody] int[] keys)
- {
- return Service.CreateBSTOutboundTasks(keys);
}
}
}
--
Gitblit v1.9.3