From 379bdd05d0b7ede3a161115b7a6fedfef104a37a Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 14 二月 2025 10:33:52 +0800
Subject: [PATCH] 小车入库前等待
---
Wms/Wms/Controllers/DownApiController.cs | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 8b596bf..c513a72 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -751,6 +751,10 @@
}
+
+
+ #endregion
+
#region AGV
/// <summary>
@@ -774,7 +778,7 @@
var time1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//娴嬭瘯鎺ュ彛鐢�
- var orderType = _taskSvc.GetTaskOrderType(model.TaskCode,"0");// 鍒ゆ柇鍗曟嵁绫诲瀷鍏ュ嚭绉�
+ var orderType = _taskSvc.GetTaskOrderType(model.TaskCode, "0");// 鍒ゆ柇鍗曟嵁绫诲瀷鍏ュ嚭绉�
var taskType = _taskSvc.GetTaskType(model.TaskCode);//鏍规嵁浠诲姟鍙疯幏鍙栦换鍔＄被鍨�
switch (orderType)
@@ -783,13 +787,19 @@
if (model.TaskTyp == "mid") //AGV鍒拌揪鍏ュ簱鍙ｏ紝璇锋眰鏀捐揣
{
//涓嬪彂WCS鏀捐揣璇锋眰
-
+ var ret = _taskSvc.GetWcsPuttype(model.CurrentCallCode,_config.WcsHost + _config.MesBeiLiaoUrl);
+ if (ret.Contains("-1"))
+ {
+ logStr = $@".\log\WCS\浠诲姟鍙嶉" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ LogFile.SaveLogToFile($"鏀捐揣璇锋眰WCS澶辫触锛屽弽棣堟墽琛岄�氱煡锛�( {model.CurrentCallCode} ),", logStr);
+ return Ok(new OutCommanAgvDto { Code = "1", Message = "澶辫触", ReqCode = model.ReqCode });
+ }
}
else if (model.TaskTyp == "end")//AGV鏀捐揣鍒板叆搴撳彛瀹屾垚
{
_stockSvc.ArriveFinish(model.TaskCode);
}
-
+
break;
case "1"://鍑哄簱浠诲姟鎵ц
@@ -811,20 +821,46 @@
}
catch (Exception ex)
{
- return Ok(new WcsModel
+ return Ok(new OutCommanAgvDto
{
- StatusCode = -1,
- Msg = ex.Message
+ Code = "1",
+ Message = ex.Message
});
}
}
+ /// <summary>
+ /// 浠诲姟缁х画鎵ц鎺ュ彛
+ /// 璋冪敤AGV浠诲姟妯℃澘continueTask锛學CS璋冪敤鎺ュ彛杩斿洖璇ュ伐浣嶅彲鏀句俊鍙�
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍙ｄ俊鎭�</param>
+ /// <returns></returns>
+ public IActionResult AgcontinueTask(PutModel model)
+ {
+ try
+ {
+ //璁板綍log
+ var logStr = $@".\log\WCS\浠诲姟鍙嶉" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"WCS浠诲姟鍙嶉鎵ц閫氱煡锛�( {jsonData} ),", logStr);
+
+ //涓嬪彂AGV鍏ュ簱浠诲姟
+ var taskType = _taskSvc.GetTaskType(model.TaskNo);
+
+
+ return Ok(new OutCommanAgvDto { Code = "0", Message = "鎴愬姛"});
+
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+ }
+
#endregion
-
- #endregion
-
#region PDA
--
Gitblit v1.8.0