From ce40df5daffae0d17b4e9fa7cb6d677afaa4d66f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 十月 2025 11:20:30 +0800
Subject: [PATCH] 更新最新程序，ERP代码，MES代码等
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 73 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 30 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..c4bf576 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"
@@ -45,7 +45,7 @@
{
return Service.AssignInboundTaskLocation(taskNum, roadwayNo);
}
-
+
/// <summary>
/// 鎴愬搧绌烘鍥炲簱
/// </summary>
@@ -63,9 +63,9 @@
/// </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>
@@ -74,11 +74,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,14 +104,13 @@
}
/// <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>
@@ -149,6 +148,18 @@
}
/// <summary>
+ /// 鍘熸枡閲囪喘缁戝畾RFID
+ /// </summary>
+ /// <param name="palletCode">绾稿嵎鏉＄爜</param>
+ /// <param name="rfidCode">绾稿嵎RIFD</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PurchaseBoxing"), AllowAnonymous]
+ public WebResponseContent PurchaseBoxing(string palletCode)
+ {
+ return Service.PurchaseBoxing(palletCode);
+ }
+
+ /// <summary>
/// 鍒嗛厤鍘熸枡鍏ュ簱宸烽亾
/// </summary>
/// <param name="palletCode"></param>
@@ -167,25 +178,30 @@
/// <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>
@@ -203,9 +219,6 @@
/// <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)
--
Gitblit v1.9.3