From 88676143aeceaeec3bd108f9cd609c4f3470ba96 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期三, 30 七月 2025 15:07:32 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 42 insertions(+), 8 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" index 8bb450b..b28f736 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" @@ -42,7 +42,14 @@ { return Service.RequestInboundTask(saveModel); } - + /// <summary> + /// 鏌ヨ璐ㄦ鏁伴噺 + /// </summary> + [HttpPost, HttpGet, Route("InQualityConfirm"), AllowAnonymous] + public WebResponseContent InQualityConfirm(string palletCode) + { + return Service.InQualityConfirm(palletCode); + } /// <summary> /// 绌虹鍏ュ簱 /// </summary> @@ -75,9 +82,9 @@ /// <param name="palletCode"></param> /// <returns></returns> [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous] - public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode) + public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode,string materielBoxCode = "") { - return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode); + return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode, materielBoxCode); } /// <summary> @@ -130,7 +137,11 @@ { return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType); } - + [HttpPost, HttpGet, Route("RequestZHInboundTask"), AllowAnonymous] + public WebResponseContent RequestZHInboundTask(string agvTaskCode, string palletCode, string palletType, string materialLot) + { + return Service.RequestZHInboundTask(agvTaskCode,palletCode,palletType,materialLot); + } /// <summary> /// 鍏ュ簱浠诲姟瀹屾垚 /// </summary> @@ -179,7 +190,6 @@ /// <summary> /// 鐢熸垚鎴愬搧鍑哄簱浠诲姟 /// </summary> - /// <param name="ProOutNo">鍑哄簱璁㈠崟鍙�</param> /// <param name="StationCode">绔欏彴鍦板潃</param> /// <returns></returns> [HttpPost, HttpGet, Route("OutProductTask"), AllowAnonymous] @@ -216,6 +226,15 @@ public async Task<WebResponseContent> OutProRworkTask([FromBody] int[] keys, string StationCode, int Grade) { return await Service.OutProductTask(keys, StationCode, Grade); + } + + /// <summary> + /// 鐢熸垚鎴愬搧鎶ュ簾浠诲姟 + /// </summary> + [HttpPost, HttpGet, Route("OutProScrapTask"), AllowAnonymous] + public async Task<WebResponseContent> OutProScrapTask([FromBody] int[] keys, string StationCode, int Grade) + { + return await Service.OutProScrapTask(keys, StationCode, Grade); } ///// <summary> ///// 鐢熸垚MESPP浠撳ぇ鍗峰嚭搴撲换鍔� @@ -260,7 +279,6 @@ { return await Service.TaskCompleted(taskNum); } - /// <summary> /// 鍗曚釜浠诲姟鎺ㄩ�佽嚦WCS /// </summary> @@ -268,9 +286,9 @@ /// <param name="agvDescription"></param> /// <returns></returns> [HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous] - public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "") + public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = "") { - return Service.PushTasksToWCSSingle(taskNum, agvDescription); + return Service.PushTasksToWCSSingle(taskNum, agvDescription, agvtaskNum); } /// <summary> /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟 @@ -374,5 +392,21 @@ { return Service.OutProductSelect(orderDetailId, proStockViews); } + /// <summary> + /// 闃荤剨鎵规鐗╂枡鏌ヨ + /// </summary> + [HttpPost, Route("GetZHMesMaterialLot"), AllowAnonymous] + public WebResponseContent GetZHMesMaterialLot(string materialLot) + { + return Service.GetZHMesMaterialLot(materialLot); + } + /// <summary> + /// 閫夊畾搴撳瓨鐢熸垚鐩樼偣鍗曞嚭搴� + /// </summary> + [HttpPost, Route("TakeOutbound"), AllowAnonymous] + public WebResponseContent TakeOutbound([FromBody] List<StockViewDTO> stockViews) + { + return Service.TakeOutbound(stockViews); + } } } -- Gitblit v1.9.3