From 0f925aa31ef78144d24878433302917c33d04c8d Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 23 十月 2024 08:27:39 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/PdaCrController.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index b4f542b..ee47568 100644
--- a/Wms/Wms/Controllers/PdaCrController.cs
+++ b/Wms/Wms/Controllers/PdaCrController.cs
@@ -10,6 +10,8 @@
using WMS.IBLL.IPdaServer;
using WMS.Entity.DataEntity;
using WMS.Entity.SysEntity;
+using Wms.Tools;
+using Microsoft.Extensions.Options;
namespace Wms.Controllers
{
@@ -19,10 +21,11 @@
public class PdaCrController : ControllerBase
{
private readonly IPdaCrServer _pdaCrSvc;
-
- public PdaCrController(IPdaCrServer pdaCrSvc)
+ private readonly ApiUrlConfig _config; //鎺ュ彛浜や簰璺緞
+ public PdaCrController(IPdaCrServer pdaCrSvc, IOptions<ApiUrlConfig> setting)
{
_pdaCrSvc = pdaCrSvc;
+ _config = setting.Value;
}
#region 鐩樼偣
@@ -360,7 +363,7 @@
}
var uId = int.Parse(userId);
- _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, uId);
+ _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, uId, _config.WcsHost + _config.GenAgvSchedulingTask);
return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
}
@@ -392,9 +395,19 @@
}
var uId = int.Parse(userId);
- _pdaCrSvc.AgvTransport2(model.SoNo,model.PalletNo, model.AreaNo, uId);
+ var str = _pdaCrSvc.AgvTransport2(model.SoNo,model.PalletNo, model.AreaNo, uId, _config.WcsHost + _config.GenAgvSchedulingTask);
+ var msgStr = "";
+ if (str.Contains("0"))
+ {
+ msgStr += "鎴愬姛";
+ }
+ if (str.Contains("1"))
+ {
+ msgStr += "閮ㄥ垎鎵樼洏宸叉湁灏忚溅绛夊緟鎵ц鎴栨鍦ㄦ墽琛岀殑浠诲姟";
+ }
+
- return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
+ return Ok(new { data = "", code = 0, msg = msgStr });
}
catch (Exception e)
{
@@ -403,5 +416,31 @@
}
#endregion
+ #region 绠辩爜鏌ヨ
+ /// <summary>
+ /// pda绠辩爜鏌ヨ
+ /// </summary>
+ /// <param name="boxNo">绠辩爜</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetBoxQueryList(string boxNo)
+ {
+ try
+ {
+ DataBoxDto stockList = _pdaCrSvc.GetBoxQueryList(boxNo);
+ if (stockList == null)
+ {
+ return Ok(new { data = stockList, code = 1, msg = "鏃犳暟鎹�" });
+ }
+ return Ok(new { data = stockList, code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+
+ }
+ #endregion
+
}
}
--
Gitblit v1.8.0