From 86985a3e211ab4cc1e94a696c15a6f77d21c462a Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期二, 15 十月 2024 18:36:51 +0800
Subject: [PATCH] 修改出库单据问题
---
Wms/Wms/Controllers/PdaCrController.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index 8704a51..d135a64 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 鐩樼偣
@@ -77,7 +80,7 @@
{
try
{
- var list = _pdaCrSvc.GetStockCheckLogList(model.CrNo, model.CrDetail, model.PalletNo, model.BoxNo);
+ var list = _pdaCrSvc.GetStockCheckLogList(model.CrNo, model.CrDetail, model.PalletNo, model.BoxNo,model.isContinue);
return Ok(new { code = 0, msg = "瑕佺洏鐐圭殑绠辩爜淇℃伅", data = list });
}
@@ -109,7 +112,7 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _pdaCrSvc.CrSetCheck(model.CrNo, model.CrDetail, model.PalletNo, model.BoxNo, model.BoxNo3, model.Result, model.Qty, int.Parse(userId));
+ _pdaCrSvc.CrSetCheck(model.CrNo, model.CrDetail, model.PalletNo, model.BoxNo, model.BoxNo3, model.Result, model.Qty,model.isContinue, int.Parse(userId));
return Ok(new { code = 0, msg = "鐩樼偣瀹屾垚", data = "" });
}
@@ -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)
{
--
Gitblit v1.8.0