From fb745c842df36edc5101291a7f239c11c97bcc2f Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期四, 11 九月 2025 16:46:33 +0800 Subject: [PATCH] 最新代码更新,BST,MES部分 --- 项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 45 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 342f455..e3ea19a 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" @@ -75,9 +75,9 @@ /// </summary> /// <returns></returns> [HttpPost, HttpGet, Route("InboundFLTask"), AllowAnonymous] - public WebResponseContent InboundFLTask(string barCode, string startPoint, string matCode, int matCount) + public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount) { - return Service.InboundFLTask(barCode, startPoint, matCode, matCount); + return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount); } /// <summary> @@ -183,6 +183,16 @@ 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> @@ -200,30 +210,43 @@ /// <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/> + /// </param> /// </summary> /// <returns></returns> [HttpPost, HttpGet, Route("RequestCPWMSTaskOut"), AllowAnonymous] - public WebResponseContent RequestCPWMSTaskOut(int Count) + public WebResponseContent RequestCPWMSTaskOut(string materialCode,int Count, int targetId) { - return Service.RequestCPWMSTaskOut(Count); + return Service.RequestCPWMSTaskOut(materialCode, Count, targetId); } - /// <summary> - /// 鏃犵汉甯冨嚭搴� - /// </summary> - /// <returns></returns> - [HttpPost, HttpGet, Route("RequestWFBWMSTaskOut"), AllowAnonymous] - public WebResponseContent RequestWFBWMSTaskOut(int Count) - { - return Service.RequestWFBWMSTaskOut(Count); - } + ///// <summary> + ///// 鏃犵汉甯冨嚭搴� + ///// </summary> + ///// <returns></returns> + //[HttpPost, HttpGet, Route("RequestWFBWMSTaskOut"), AllowAnonymous] + //public WebResponseContent RequestWFBWMSTaskOut(int Count) + //{ + // return Service.RequestWFBWMSTaskOut(Count); + //} /// <summary> /// 鍘熸枡鍑哄簱浠诲姟 /// </summary> /// <param name="materielCode">鐗╂枡浠g爜</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,string address="") @@ -280,5 +303,13 @@ { 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