From 1f121db427cc068eee97b699c410d1b5f320e867 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 06 九月 2025 14:26:27 +0800
Subject: [PATCH] 最新代码提交
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 111 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 97 insertions(+), 14 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 24cc3df..f6446dc 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"
@@ -57,17 +57,7 @@
{
return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
}
- /// <summary>
- /// 鎴愬搧浣欐枡閫�搴撳叆浠�
- /// </summary>
- /// <param name="barCode"></param>
- /// <param name="startPoint"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("BackProductTask"), AllowAnonymous]
- public WebResponseContent BackProductTask(string barCode, string startPoint)
- {
- return Service.BackProductTask(barCode, startPoint);
- }
+
/// <summary>
/// 鎴愬搧绌烘鍥炲簱
/// </summary>
@@ -78,6 +68,16 @@
public WebResponseContent EmptyBackTask(string barCode, string startPoint)
{
return Service.EmptyBackTask(barCode, startPoint);
+ }
+
+ /// <summary>
+ /// 杈呮枡鍏ュ簱
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("InboundFLTask"), AllowAnonymous]
+ public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount)
+ {
+ return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount);
}
/// <summary>
@@ -182,6 +182,31 @@
{
return Service.RequestYLWMSTaskSimple(stationCode,palletCode);
}
+ /// <summary>
+ /// 鍘熸枡鍏ュ簱鐢宠
+ /// </summary>
+ /// <param name="palletCode">鏉＄爜</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("YLPurchaseBoxing"), AllowAnonymous]
+ public WebResponseContent YLPurchaseBoxing(string palletCode)
+ {
+ return Service.YLPurchaseBoxing(palletCode);
+ }
+ /// <summary>
+ /// 鍒嗛厤鍘熸枡鍏ュ簱宸烽亾
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("AssignYLRoadwayNo"), AllowAnonymous]
+ public WebResponseContent AssignYLRoadwayNo(string palletCode)
+ {
+ string roadWay= Service.AssignYLRoadwayNo(palletCode);
+ if (string.IsNullOrEmpty(roadWay))
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板彲鍒嗛厤宸烽亾");
+ }
+ return WebResponseContent.Instance.OK(data: roadWay);
+ }
/// <summary>
/// 鎴愬搧鍑哄簱浠诲姟璇锋眰
@@ -192,17 +217,27 @@
{
return Service.RequestCPWMSTaskOut(Count);
}
+
+ /// <summary>
+ /// 鏃犵汉甯冨嚭搴�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("RequestWFBWMSTaskOut"), AllowAnonymous]
+ public WebResponseContent RequestWFBWMSTaskOut(int Count)
+ {
+ return Service.RequestWFBWMSTaskOut(Count);
+ }
+
/// <summary>
/// 鍘熸枡鍑哄簱浠诲姟
/// </summary>
/// <param name="materielCode">鐗╂枡浠ｇ爜</param>
/// <param name="materielWide">鐗╂枡骞呭</param>
- /// <param name="Count">鍗锋暟</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("RequestYLWMSTaskOut"), AllowAnonymous]
- public WebResponseContent RequestYLWMSTaskOut(string materielCode,int materielWide, int Count)
+ public WebResponseContent RequestYLWMSTaskOut(string materielCode,int materielWide, int count,string address="")
{
- return Service.RequestYLWMSTaskOut(materielCode, materielWide, Count);
+ return Service.RequestYLWMSTaskOut(materielCode, materielWide, count, address);
}
/// <summary>
/// 鍘熸枡绉诲簱浠诲姟
@@ -216,5 +251,53 @@
{
return Service.IsRelocation(startAddress, endAddress, roadWay);
}
+ /// <summary>
+ /// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("RelocationRoadWay"), AllowAnonymous]
+ public WebResponseContent RelocationRoadWay(string roadWay,int Count)
+ {
+ return Service.RelocationRoadWay(roadWay, Count);
+ }
+ /// <summary>
+ /// 鍒嗛厤鎴愬搧宸烽亾
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("AssignCPRoadwayNo"), AllowAnonymous]
+ public string AssignCPRoadwayNo()
+ {
+ return Service.AssignCPRoadwayNo();
+ }
+ /// <summary>
+ /// 鍗板埛浣欐枡閫�鏂欎换鍔�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PrintBackInbound"), AllowAnonymous]
+ public WebResponseContent PrintBackInbound([FromBody]SaveModel saveModel)
+ {
+ return Service.PrintBackInbound(saveModel);
+ }
+ /// <summary>
+ /// 鍗板埛涓嬫枡浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PrintInbound"), AllowAnonymous]
+ public WebResponseContent PrintInbound([FromBody] SaveModel saveModel)
+ {
+ return Service.PrintInbound(saveModel);
+ }
+ /// <summary>
+ /// 鍒涘缓鍘熺焊鐢熶骇鎺掔▼鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("CreateBSTOutboundTasks"), AllowAnonymous]
+ public WebResponseContent CreateBSTOutboundTasks([FromBody] int[] keys)
+ {
+ return Service.CreateBSTOutboundTasks(keys);
+ }
}
}
--
Gitblit v1.9.3