From 2920728d7908da2ee196f3af8b3d1c635696e9a1 Mon Sep 17 00:00:00 2001
From: zwc <526854230@qq.com>
Date: 星期三, 15 一月 2025 15:47:15 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/DownApiController.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 09af858..a578558 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -17,6 +17,7 @@
using Model.ModelVm.PdaVm;
using WMS.IBLL.IPdaServer;
using Model.ModelVm;
+using WMS.IBLL.IDataServer;
namespace Wms.Controllers
{
@@ -34,8 +35,9 @@
private readonly ITaskServer _taskSvc;//浠诲姟Svc
private readonly IPdaSoServer _pdaSoSvc;//绌烘墭鍑哄簱Svc
private readonly IPdaAsnServer _paAsnSvc;//绌烘墭璺虹粦瀹�
+ private readonly IStockServer _stockSvc;//AGV浠诲姟瀹屾垚绠�
- public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc,IPdaAsnServer paAsnSvc)
+ public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc,IPdaAsnServer paAsnSvc,IStockServer stockSvc)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -44,6 +46,7 @@
_taskSvc = taskSvc;
_pdaSoSvc = pdaSoSvc;
_paAsnSvc = paAsnSvc;
+ _stockSvc = stockSvc;
}
#region WMS鎺ュ彛 璋冪敤涓嬫父绯荤粺鎺ュ彛
@@ -374,7 +377,7 @@
case "1"://鍑哄簱瀹屾垚浠诲姟
if (model.TaskType == "1")//0锛氬叆搴� 1锛氬嚭搴� 2锛氱Щ搴�
{
- _exNoticeSvc.ExportSuccess(model.TaskNo, 0);
+ _exNoticeSvc.ExportSuccess(model.TaskNo, 0, _config.AgvHost + _config.GenAgvSchedulingTask);
return Ok(new WcsModel { StatusCode = 0, Msg = "鍑哄簱瀹屾垚" });
}
else if (model.TaskType == "2")
@@ -696,6 +699,31 @@
//杞﹂棿鍙枡
+ //WCS鐢宠鎷嗗灈淇℃伅
+ /// <summary>
+ /// 鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult ResultBoxInfoCheckWcs(BoxInfoCheck model)
+ {
+ var logStr = $@".\log\WCS\WCS鐢宠鎷嗗灈鎵樼洏淇℃伅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ try
+ {
+ RequestBoxInfoCheck list = _exNoticeSvc.BoxInfoCheckWcs(model);
+ return Ok(new { Success = 1,Message = "鎷嗗灈淇℃伅鑾峰彇鎴愬姛",data = list});
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WCS鐢宠鎵樼洏鎷嗗灈寮傚父杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message});
+ }
+
+ }
+
#region AGV
@@ -704,10 +732,10 @@
/// AGV 鎵ц鍥炶皟鐨勬柟娉曪紝鍖呭惈浠诲姟寮�濮嬶紝璧板嚭鍌ㄤ綅锛屼换鍔″畬鎴愬強浠诲姟鍙栨秷銆�
/// 鍙栨秷閫氱煡涓轰换鍔″崟锛屽叾浠栭�氱煡涓哄崟涓换鍔＄粍鎴栧瓙浠诲姟銆傛敞鎰忥細鏄惁閫氱煡闇�瑕佸湪浠诲姟妯℃澘閰嶇疆
/// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
/// <returns></returns>
- /// <exception cref="Exception"></exception>
[HttpPost]
- public IActionResult AgvCallback(AgvContinueTask model)
+ public IActionResult AgvCallback(AgvTaskDto model)
{
try
{
@@ -718,21 +746,32 @@
//鎺ユ敹鏃堕棿
var time1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+ //娴嬭瘯鎺ュ彛鐢�
var orderType = _taskSvc.GetTaskOrderType(model.TaskCode);// 鍒ゆ柇鍗曟嵁绫诲瀷鍏ュ嚭绉�
var taskType = _taskSvc.GetTaskType(model.TaskCode);//鏍规嵁浠诲姟鍙疯幏鍙栦换鍔＄被鍨�
switch (orderType)
{
case "0"://鍏ュ簱浠诲姟鎵ц
+ _stockSvc.ArriveFinish(model.TaskCode);
+ break;
case "1"://鍑哄簱浠诲姟鎵ц
+ _stockSvc.SoFinish(model.TaskCode);
+ break;
+
case "2"://鐩樺簱浠诲姟鎵ц
+
case "3"://绉诲簱浠诲姟鎵ц
- return Ok(new OutCommanAgvDto { Code = "0", Message = "鎴愬姛", ReqCode = model.ReqCode });
+ _stockSvc.MoveFinish(model.TaskCode);
+ break;
+ // return Ok(new OutCommanAgvDto { Code = "0", Message = "鎴愬姛", ReqCode = model.ReqCode });
default:
return Ok(new OutCommanAgvDto { Code = "1", Message = "澶辫触", ReqCode = model.ReqCode });
}
+ return Ok(new OutCommanAgvDto { Code = "0", Message = "鎴愬姛", ReqCode = model.ReqCode });
}
catch (Exception ex)
@@ -745,7 +784,7 @@
}
}
-
+
#endregion
--
Gitblit v1.8.0