From e34f379c22862982c20376c952ab56f9c4ccb163 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 25 六月 2024 08:08:04 +0800
Subject: [PATCH] 修改controller
---
Wms/Wms/Controllers/UpApiController.cs | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 7a4852e..248a222 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -33,8 +33,9 @@
private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc
private readonly IProcurePlanServer _procurePlanSvc;//閲囪喘鍗昐vs
private readonly IRcsServer _rcsserver;//RCS鐩稿叧浠诲姟
+ private readonly INoticeServer _noticeSvc;//浜屾ゼ鍗曟嵁鐩稿叧
- public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc,IRcsServer rcsserver)
+ public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc,IRcsServer rcsserver, INoticeServer noticeSvc)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -42,7 +43,7 @@
_stockCheckSvc = stockCheckSvc;
_procurePlanSvc = procurePlanSvc;
_rcsserver = rcsserver;
-
+ _noticeSvc = noticeSvc;
}
#endregion
@@ -407,19 +408,16 @@
[HttpPost]
public IActionResult GetPalletNo(Pallnetmsg pallmsg)
{
- var Pallnet = "";
- var locate = "";
var result = new ErpModel { Success = -1, Message = "",};
try
{
- if (pallmsg.lotno != null)
+ if (string.IsNullOrWhiteSpace(pallmsg.Location))
{
- _rcsserver.GetPalletNo(pallmsg.warehouseno, pallmsg.type, pallmsg.lotno, out Pallnet, out locate);
+ result.Message = "鍙枡浣嶇疆涓虹┖锛�";
+ return Ok(result);
}
- else
- {
- _rcsserver.GetPalletNo(pallmsg.warehouseno, pallmsg.type, out Pallnet, out locate);
- }
+ _rcsserver.GetPalletNo(pallmsg);
+
result.Success = 0;
result.Message = "鍙《鎴愬姛锛�";
@@ -431,15 +429,15 @@
return Ok(result);
}
}
+
//RCS鐢宠鍌ㄤ綅
[HttpPost]
public IActionResult ApplyLocatNo(Pallnetmsg pallmsg)
{
- var lotno = "";
var result = new ErpModel { Success = -1, Message = "" };
try
{
- _rcsserver.ApplyLocatNo(pallmsg.palletno,pallmsg.type, out lotno);
+ _rcsserver.ApplyLocatNo(pallmsg);
result.Success = 0;
result.Message = "鐢宠鍌ㄤ綅鎴愬姛锛�";
return Ok(result);
@@ -451,25 +449,6 @@
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);
--
Gitblit v1.8.0