From 157abc191c34e57c1b958ae74fc3de6518ca8a30 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 28 二月 2025 11:06:36 +0800
Subject: [PATCH] 修改客户需求
---
Wms/Wms/Controllers/DownApiController.cs | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index c513a72..e558169 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -36,8 +36,9 @@
private readonly IPdaSoServer _pdaSoSvc;//绌烘墭鍑哄簱Svc
private readonly IPdaAsnServer _paAsnSvc;//绌烘墭璺虹粦瀹�
private readonly IStockServer _stockSvc;//AGV浠诲姟瀹屾垚绠�
+ private readonly IPdaCrServer _pdaCrServer; // PDA浠诲姟璋冨害
- public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc,IPdaAsnServer paAsnSvc,IStockServer stockSvc)
+ public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc,IPdaAsnServer paAsnSvc,IStockServer stockSvc,IPdaCrServer pdaCrServer)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -46,7 +47,8 @@
_taskSvc = taskSvc;
_pdaSoSvc = pdaSoSvc;
_paAsnSvc = paAsnSvc;
- _stockSvc = stockSvc;
+ _stockSvc = stockSvc;
+ _pdaCrServer = pdaCrServer;
}
#region WMS鎺ュ彛 璋冪敤涓嬫父绯荤粺鎺ュ彛
@@ -552,12 +554,12 @@
[HttpPost]
public IActionResult BindPlnInHouseWcs(PalletsBind model)
{
- var logStr = $@".\log\WCS\WCS鐢宠绌烘墭璺虹粦瀹�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ var logStr = $@".\log\WCS\WCS鍙堝彔鎵樻満鐢宠绌烘墭鍏ュ簱" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
try
{
var strMsg = _paAsnSvc.BindNullPallets(model);
- return Ok(new { Success = 0, Message = "绌烘墭璺虹粦瀹氭垚鍔�", TaskList = strMsg });
+ return Ok(new { Success = 0, Message = "绌烘墭璺虹粦瀹氭垚鍔�"});
}
catch (Exception e)
{
@@ -586,6 +588,30 @@
catch (Exception e)
{
LogFile.SaveLogToFile($"WCS鐢宠绌烘墭鍑哄簱寮傚父杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// WMS鎷ｈ揣鐢宠绌烘墭鍑哄簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult IssuePlnCheckHouseWcs(CheckModePalletVm model)
+ {
+ var logStr = $@".\log\WCS\WMS鎷ｈ揣鐢宠绌烘墭鍑哄簱" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ try
+ {
+ string list = _pdaSoSvc.IssuePlnCehckHouseWcs(model, 0,_config.AgvHost+_config.GenAgvSchedulingTask);
+
+ return Ok(new { Success = 0, Message = "鎷ｈ揣鍙┖鎵樼洏鎴愬姛"});
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WMS鎷ｈ揣鐢宠绌烘墭鍑哄簱寮傚父杩斿洖锛�( {e.Message} ),", logStr);
return Ok(new ErpModel { Success = -1, Message = e.Message });
}
@@ -739,19 +765,18 @@
{
//杩斿洖鍑哄簱鍒嗘嫞瑁呰溅鍙�
var list = _exNoticeSvc.BoxInfoExportWcs(model.BoxNo);
- return Ok(new { Success = 1, Message = "鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣鎴愬姛", loadubgAddre = list });
+ return Ok(new { Success = "1", Message = "鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣鎴愬姛", loadubgAddre = list });
}
catch (Exception e)
{
LogFile.SaveLogToFile($"WCS鐢宠鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣寮傚父杩斿洖锛�( {e.Message} ),", logStr);
- return Ok(new ErpModel { Success = -1, Message = e.Message });
+ return Ok(new { Success = "-1", Message = e.Message, loadubgAddre ="" });
}
}
-
-
+
#endregion
@@ -784,10 +809,10 @@
switch (orderType)
{
case "0"://鍏ュ簱浠诲姟鎵ц
- if (model.TaskTyp == "mid") //AGV鍒拌揪鍏ュ簱鍙ｏ紝璇锋眰鏀捐揣
+ if (model.Method == "mid") //AGV鍒拌揪鍏ュ簱鍙ｏ紝璇锋眰鏀捐揣
{
//涓嬪彂WCS鏀捐揣璇锋眰
- var ret = _taskSvc.GetWcsPuttype(model.CurrentCallCode,_config.WcsHost + _config.MesBeiLiaoUrl);
+ var ret = _taskSvc.GetWcsPuttype(model.TaskCode,_config.WcsHost + _config.HttpInRequest);
if (ret.Contains("-1"))
{
logStr = $@".\log\WCS\浠诲姟鍙嶉" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
@@ -795,21 +820,21 @@
return Ok(new OutCommanAgvDto { Code = "1", Message = "澶辫触", ReqCode = model.ReqCode });
}
}
- else if (model.TaskTyp == "end")//AGV鏀捐揣鍒板叆搴撳彛瀹屾垚
+ else if (model.Method == "end")//AGV鏀捐揣鍒板叆搴撳彛瀹屾垚
{
- _stockSvc.ArriveFinish(model.TaskCode);
+ _stockSvc.ArriveFinish(model.TaskCode,_config.WcsHost + _config.HttpInFinish);
}
break;
case "1"://鍑哄簱浠诲姟鎵ц
- _stockSvc.SoFinish(model.TaskCode);
+ _stockSvc.SoFinish(model.TaskCode,_config.MesHost + _config.MesBeiLiaoUrl);
break;
case "2"://鐩樺簱浠诲姟鎵ц
case "3"://绉诲簱浠诲姟鎵ц
- _stockSvc.MoveFinish(model.TaskCode);
+ _stockSvc.MoveFinish(model.TaskCode, _config.MesHost + _config.MesBeiLiaoUrl);
break;
// return Ok(new OutCommanAgvDto { Code = "0", Message = "鎴愬姛", ReqCode = model.ReqCode });
@@ -836,6 +861,7 @@
/// </summary>
/// <param name="model">鍏ュ簱鍙ｄ俊鎭�</param>
/// <returns></returns>
+ [HttpPost]
public IActionResult AgcontinueTask(PutModel model)
{
try
@@ -845,17 +871,17 @@
var jsonData = JsonConvert.SerializeObject(model);
LogFile.SaveLogToFile($"WCS浠诲姟鍙嶉鎵ц閫氱煡锛�( {jsonData} ),", logStr);
- //涓嬪彂AGV鍏ュ簱浠诲姟
- var taskType = _taskSvc.GetTaskType(model.TaskNo);
+ //涓嬪彂AGV缁х画鎵ц
+ _pdaCrServer.AgvContinue(model.TaskNo,_config.AgvHost+_config.ContinueTask);
- return Ok(new OutCommanAgvDto { Code = "0", Message = "鎴愬姛"});
+ return Ok(new HttpReturnModel { Success = "0", Message = "鎴愬姛"});
}
- catch (Exception)
+ catch (Exception ex)
{
-
- throw;
+ return Ok(new HttpReturnModel { Success = "1", Message = ex.ToString() });
+ throw ex;
}
}
--
Gitblit v1.8.0