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 | 203 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 160 insertions(+), 43 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 7b2f635..632d00f 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -404,24 +404,95 @@
}
}
- //RCS鍙《
+ #region 浜屾ゼ涓氬姟
+ /// <summary>
+ /// RCS鍙《
+ /// </summary>
+ /// <param name="pallmsg"></param>
+ /// <returns></returns>
[HttpPost]
public IActionResult GetPalletNo(Pallnetmsg pallmsg)
{
- var Pallnet = "";
- var locate = "";
- var result = new ErpModel { Success = -1, Message = "",};
+ var logStr = $@".\log\AGV\AGV鐢宠鍙《" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ var result = new ErpModel { Success = -1, Message = "", };
try
{
- if (pallmsg.lotno != null)
+ var jsonData = JsonConvert.SerializeObject(pallmsg);
+ LogFile.SaveLogToFile($"AGV鐢宠鍙《锛�( {jsonData} ),", logStr);
+
+ if (string.IsNullOrWhiteSpace(pallmsg.Location))
{
- _rcsserver.GetPalletNo(pallmsg.warehouseno, pallmsg.type, pallmsg.lotno, out Pallnet, out locate);
+ result.Message = "鍙枡浣嶇疆涓虹┖锛�";
+ return Ok(result);
}
- else
+ if (string.IsNullOrWhiteSpace(pallmsg.Type))
{
- _rcsserver.GetPalletNo(pallmsg.warehouseno, pallmsg.type, out Pallnet, out locate);
+ 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
+ {
+ if (string.IsNullOrWhiteSpace(pallmsg.Location))
+ {
+ result.Message = "鍙枡浣嶇疆涓虹┖锛�";
+ return Ok(result);
+ }
+ 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);
@@ -432,52 +503,52 @@
return Ok(result);
}
}
- //RCS鐢宠鍌ㄤ綅
+
+ /// <summary>
+ /// RCS鐢宠鍌ㄤ綅
+ /// </summary>
+ /// <param name="pallmsg"></param>
+ /// <returns></returns>
[HttpPost]
public IActionResult ApplyLocatNo(Pallnetmsg pallmsg)
{
- var lotno = "";
+ var logStr = $@".\log\AGV\AGV鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+
var result = new ErpModel { Success = -1, Message = "" };
try
{
- _rcsserver.ApplyLocatNo(pallmsg.palletno,pallmsg.type, out lotno);
+ 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);
}
}
- //涓嬪彂璋冨害RCS浠诲姟
- //RCS鐢宠鍌ㄤ綅
- [HttpPost]
- public IActionResult genAgvSchedulingTask(AgvTask agvtask)
- {
- var lotno = "";
- var url = "";
- genAgvSchedulingTaskRep chrep = new genAgvSchedulingTaskRep();
- var result = new ErpModel { Success = -1, Message = "" };
- try
- {
- _rcsserver.genAgvSchedulingTask(agvtask,url,ref chrep);
- result.Success = 0;
- result.Message = "鐢宠鍌ㄤ綅鎴愬姛锛�";
- return Ok(result);
- }
- catch (Exception e)
- {
-
- result.Message = e.Message;
- return Ok(result);
- }
- }
-
- #region 浜屾ゼ涓氬姟
/// <summary>
/// 鍏ュ簱鍗曟嵁涓嬪彂
/// </summary>
@@ -513,14 +584,61 @@
}
/// <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
+ {
+ //璁板綍log
+ var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"浠诲姟鎵ц閫氱煡锛�( {jsonData} ),", logStr);
+
+ if (string.IsNullOrEmpty(model.reqCode))
+ {
+ return Ok(new AgvResultModel { code = "-1", message = "璇锋眰澶辫触锛宺eqCode鍙傛暟寮傚父", reqCode = model.reqCode });
+ }
+ switch (model.method)
+ {
+ case "start"://浠诲姟寮�濮�
+ return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
+
+ case "outbin"://璧板嚭鍌ㄤ綅
+ return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
+
+ 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 ex)
+ {
+ return Ok(new AgvResultModel { code = "-1", message = ex.Message, reqCode = model.reqCode });
+ }
+ }
+
+ /// <summary>
+ /// 鍑哄簱鍗曟嵁涓嬪彂
+ /// </summary>
+ /// <param name="model">鍑哄簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ //[Authorize]
+ [HttpPost]
+ public IActionResult CreateSoWork(SoInfo model)
+ {
try
{
/*var claimsIdentity = this.User.Identity as ClaimsIdentity;
@@ -534,14 +652,13 @@
throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
}*/
- result = _noticeSvc.RCSFinishTask(model.TaskNo,model.Status);
-
+ SoResInfo result = _noticeSvc.CreateSoWork(model);
return Ok(result);
+
}
catch (Exception e)
{
- result.Message = e.Message;
- return Ok(result);
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
}
}
#endregion
--
Gitblit v1.8.0