From 71d1dcdf796f08fa01cbc2d3faab86eea28b295b Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 17 十二月 2025 08:59:03 +0800
Subject: [PATCH] 物料管理页面修改
---
Wms/Wms/Controllers/DownApiController.cs | 101 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 89 insertions(+), 12 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 11c49eb..c21314f 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -23,6 +23,7 @@
using Model.ModelVm.BllCheckVm;
using Model.ModelVm.SysVm;
using System.Security.Policy;
+using Model.ModelVm.DataVm;
namespace Wms.Controllers
{
@@ -954,9 +955,9 @@
}
var jsonData = JsonConvert.SerializeObject(model);
LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
-
+
//鍏蜂綋澶勭悊鏂规硶
- _hopper.RCSFinishTask(model.robotTaskCode, "1", "AGV");
+ _hopper.RCSFinishTask(model.robotTaskCode, extraValue.values.slotName, "1", "AGV");
Data data = new Data();
data.robotTaskCode = model.robotTaskCode;
@@ -991,18 +992,22 @@
AgvResultModel2 resultModel = null;//杩斿洖淇℃伅
try
{
+ var extraValue = new ExtraModel();
+ extraValue = model.extra;
+ if (!(extraValue.values.method == "cancel"))
+ {
+ throw new Exception("灏忚溅璋冪敤鏂规硶閿欒");
+ }
var jsonData = JsonConvert.SerializeObject(model);
- LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
-
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍙栨秷-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
//鍏蜂綋澶勭悊鏂规硶
+ //_rcsserver.CancelTask(model.robotTaskCode, _config.AgvHost + _config.CancelTask, 0);
-
-
- resultModel.code = "0";
- resultModel.message = "鎴愬姛";
- resultModel.da.robotTaskCode = model.robotTaskCode;
+ Data data = new Data();
+ //data.robotTaskCode = model.robotTaskCode;
+ resultModel = new AgvResultModel2 { code = "0", message = "鎴愬姛", da = data };
var jsonData2 = JsonConvert.SerializeObject(resultModel);
- LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍙栨秷-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
return Ok(resultModel);
}
catch (Exception ex)
@@ -1040,6 +1045,9 @@
break;
case "end":
var b = end(model);
+ break;
+ case "cancel":
+ var c = cancel(model);
break;
default:
break;
@@ -1180,7 +1188,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _rcsserver.CancelTask(model.taskNo, int.Parse(userId));
+ _rcsserver.CancelTask(model.taskNo, _config.AgvHost + _config.CancelTask, int.Parse(userId));
return Ok(new { code = 0, msg = "鎴愬姛鍙栨秷浠诲姟", data = "" });
}
@@ -1419,7 +1427,76 @@
}
}
-
+ /// <summary>
+ /// 鐐瑰鐐逛换鍔�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult PointToPointRequest(PointTask model)
+ {
+ var logStr = $@".\log\AGV\鐐瑰鐐逛换鍔′笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ AgvResultModel resultModel = null;//杩斿洖淇℃伅
+ try
+ {
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"浠诲姟涓嬪彂锛�( {jsonData} ),", logStr);
+ //鍏蜂綋澶勭悊鏂规硶
+ _hopper.PointToPointRequest(model.ID, model.BeginPoint, model.EndPoint, _config.AgvHost + _config.GenAgvSchedulingTask, _config.AgvHost + _config.AGVBindPallets);
+
+ resultModel = new AgvResultModel { code = "0", message = "璇锋眰鎴愬姛!" };
+
+ return Ok(resultModel);
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"涓嬪彂鐐瑰鐐逛换鍔″紓甯革細( {e.Message} ),", logStr);
+ resultModel = new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" };
+ return Ok(resultModel);
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎褰撳墠搴撳瓨淇℃伅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult DelStockWms(DelStockInfo model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ string errMsg = "";
+ bool t = _rcsserver.DelStockWms(model.StockId, _config.AgvHost + _config.AGVUnBindPallets, int.Parse(userId),out errMsg);
+ if (t)
+ {
+ return Ok(new { code = 0, msg = "鍒犻櫎鎴愬姛", data = "" });
+ }
+ else
+ {
+ return Ok(new { code = 1, msg = "鍒犻櫎澶辫触", data = errMsg });
+ }
+
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+
#endregion
}
--
Gitblit v1.8.0