From 0651efda1f08d417c82994887c68dfea2c9b4235 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 11 十二月 2024 11:28:37 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/UpApiController.cs | 142 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 123 insertions(+), 19 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index c1093d8..632d00f 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -413,6 +413,72 @@
[HttpPost]
public IActionResult GetPalletNo(Pallnetmsg pallmsg)
{
+ var logStr = $@".\log\AGV\AGV鐢宠鍙《" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ var result = new ErpModel { Success = -1, Message = "", };
+ try
+ {
+ var jsonData = JsonConvert.SerializeObject(pallmsg);
+ LogFile.SaveLogToFile($"AGV鐢宠鍙《锛�( {jsonData} ),", logStr);
+
+ if (string.IsNullOrWhiteSpace(pallmsg.Location))
+ {
+ result.Message = "鍙枡浣嶇疆涓虹┖锛�";
+ return Ok(result);
+ }
+ if (string.IsNullOrWhiteSpace(pallmsg.Type))
+ {
+ result.Message = "浠诲姟绫诲瀷涓虹┖锛�";
+ return Ok(result);
+ }
+ _rcsserver.GetPalletNo(pallmsg ,_config.AgvHost + _config.GenAgvSchedulingTask);
+ result.Success = 0;
+ result.Message = "鍙《鎴愬姛锛�";
+ return Ok(result);
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"AGV鐢宠鍙《寮傚父锛�( {e.Message} ),", logStr);
+
+ result.Message = e.Message;
+ return Ok(result);
+ }
+ }
+ /// <summary>
+ /// 灏嗗噣妗舵敼涓鸿剰妗跺苟鎷夊埌鑴忔《鍖�
+ /// </summary>
+ /// <param name="pallmsg"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult ChangePalletStatus(Pallnetmsg pallmsg)
+ {
+ var result = new ErpModel { Success = -1, Message = "", };
+ try
+ {
+ if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
+ {
+ result.Message = "妗剁紪鍙蜂笉鑳戒负绌猴紒";
+ return Ok(result);
+ }
+ _rcsserver.ChangePalletStatus(pallmsg.PalletNo, _config.AgvHost + _config.GenAgvSchedulingTask);
+ result.Success = 0;
+ result.Message = "鎿嶄綔鎴愬姛锛�";
+ return Ok(result);
+ }
+ catch (Exception e)
+ {
+ result.Message = e.Message;
+ return Ok(result);
+ }
+ }
+
+ /// <summary>
+ /// MES涓嬪彂娓呮礂閿佸畾鑴忔《
+ /// </summary>
+ /// <param name="pallmsg"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CleanPallet(Pallnetmsg pallmsg)
+ {
var result = new ErpModel { Success = -1, Message = "", };
try
{
@@ -421,9 +487,12 @@
result.Message = "鍙枡浣嶇疆涓虹┖锛�";
return Ok(result);
}
- _rcsserver.GetPalletNo(pallmsg);
-
-
+ if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
+ {
+ result.Message = "妗跺彿涓虹┖锛�";
+ return Ok(result);
+ }
+ _rcsserver.CleanPallet(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask);
result.Success = 0;
result.Message = "鍙《鎴愬姛锛�";
return Ok(result);
@@ -443,16 +512,37 @@
[HttpPost]
public IActionResult ApplyLocatNo(Pallnetmsg pallmsg)
{
+ var logStr = $@".\log\AGV\AGV鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+
var result = new ErpModel { Success = -1, Message = "" };
try
{
- _rcsserver.ApplyLocatNo(pallmsg);
+ var jsonData = JsonConvert.SerializeObject(pallmsg);
+ LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅锛�( {jsonData} ),", logStr);
+
+ if (string.IsNullOrWhiteSpace(pallmsg.Location))
+ {
+ result.Message = "鐢宠浣嶇疆涓虹┖锛�";
+ return Ok(result);
+ }
+ if (string.IsNullOrWhiteSpace(pallmsg.Type))
+ {
+ result.Message = "浠诲姟绫诲瀷涓虹┖锛�";
+ return Ok(result);
+ }
+ if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
+ {
+ result.Message = "鐢宠鎵樼洏鍙蜂负绌猴紒";
+ return Ok(result);
+ }
+ _rcsserver.ApplyLocatNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask);
result.Success = 0;
result.Message = "鐢宠鍌ㄤ綅鎴愬姛锛�";
return Ok(result);
}
catch (Exception e)
{
+ LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅寮傚父锛�( {e.Message} ),", logStr);
result.Message = e.Message;
return Ok(result);
@@ -494,35 +584,49 @@
}
/// <summary>
- /// 浠诲姟瀹屾垚鍙嶉
+ /// Agv浠诲姟瀹屾垚鍙嶉
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult RCSFinishTask(TaskModel model)
+ public IActionResult agvCallBack(AgvTaskDto model)
{
var result = new ErpModel { Success = -1, Message = "" };
try
{
- /*var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
+ //璁板綍log
+ var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"浠诲姟鎵ц閫氱煡锛�( {jsonData} ),", logStr);
+
+ if (string.IsNullOrEmpty(model.reqCode))
{
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ return Ok(new AgvResultModel { code = "-1", message = "璇锋眰澶辫触锛宺eqCode鍙傛暟寮傚父", reqCode = model.reqCode });
}
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
+ switch (model.method)
{
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }*/
+ case "start"://浠诲姟寮�濮�
+ return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
- result = _noticeSvc.RCSFinishTask(model.TaskNo, model.Status);
+ case "outbin"://璧板嚭鍌ㄤ綅
+ return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
- return Ok(result);
+ case "end"://浠诲姟缁撴潫
+ result = _noticeSvc.RCSFinishTask(model.reqCode, "1");
+ return Ok(result);
+ case "cancel"://浠诲姟鍗曞彇娑�
+ return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
+
+ case "apply"://CTU鏂欑鍙栨斁鐢宠
+ return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
+
+ default:
+ return Ok(new AgvResultModel { code = "-1", message = "璇锋眰澶辫触锛宮ethod浠诲姟绫诲瀷閿欒", reqCode = model.reqCode });
+ }
}
- catch (Exception e)
+ catch (Exception ex)
{
- result.Message = e.Message;
- return Ok(result);
+ return Ok(new AgvResultModel { code = "-1", message = ex.Message, reqCode = model.reqCode });
}
}
@@ -548,7 +652,7 @@
throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
}*/
- SoResInfo result = _exNoticeSvc.ErpAddExportNotice(model);
+ SoResInfo result = _noticeSvc.CreateSoWork(model);
return Ok(result);
}
--
Gitblit v1.8.0