From 53a8c6fe671bf510f94aabe398099bd2b8540539 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 17 二月 2025 09:28:12 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/UpApiController.cs | 35 +++++++++--------
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 6 +++
Wms/Model/InterFaceModel/HttpModel.cs | 2
Wms/WMS.IBLL/IDataServer/IStockServer.cs | 2
Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs | 5 ++
Wms/Wms/Controllers/DownApiController.cs | 9 ++--
Wms/WMS.BLL/DataServer/StockServer.cs | 4 +-
7 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index 7d88f99..206f8e1 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -1128,7 +1128,7 @@
public string Origin { get; set; }
}
- public class ReLocateData
+ public class ReLocateDataModel
{
/// <summary>
/// 搴撲綅
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index a8cc00b..f4b7e60 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1626,6 +1626,12 @@
}
}
+ /// <summary>
+ /// 涓嬪彂AGV浠诲姟缁х画鎵ц
+ /// </summary>
+ /// <param name="taskno"></param>
+ /// <param name="url"></param>
+ /// <returns></returns>
public void AgvContinue(string taskno,string url)
{
var data = new { reqCode =taskno };
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index f15abb3..89c8c23 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -1213,11 +1213,11 @@
/// </summary>
/// <param name=""></param>
/// <returns></returns>
- public List<ReLocateData> GetLocateList()
+ public List<ReLocateDataModel> GetLocateList()
{
try
{
- List<ReLocateData> list = new List<ReLocateData>();
+ List<ReLocateDataModel> list = new List<ReLocateDataModel>();
//搴撳瓨淇℃伅
var stockDetailsList = Db.Queryable<StockDetailDto>().ToList();
diff --git a/Wms/WMS.IBLL/IDataServer/IStockServer.cs b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
index 7cf5723..3062e6f 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
@@ -150,6 +150,6 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- List<ReLocateData> GetLocateList();
+ List<ReLocateDataModel> GetLocateList();
}
}
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
index 32bb442..fd4a5f4 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
@@ -152,6 +152,11 @@
/// <param name="model"></param>
public void cancelTask(string taskno, string url);
+
+ /// <summary>
+ /// agv浠诲姟缁х画鎵ц
+ /// </summary>
+ /// <param name="model"></param>
public void AgvContinue(string taskno,string url);
#endregion
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index aa08b42..0b06f04 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -839,6 +839,7 @@
/// </summary>
/// <param name="model">鍏ュ簱鍙ｄ俊鎭�</param>
/// <returns></returns>
+ [HttpPost]
public IActionResult AgcontinueTask(PutModel model)
{
try
@@ -852,13 +853,13 @@
_pdaCrServer.AgvContinue(model.TaskNo,_config.AgvHost+_config.ContinueTask);
- return Ok(new OutCommanAgvDto { Code = "0", Message = "鎴愬姛"});
+ return Ok(new HttpReturnModel { Success = "0", Message = "鎴愬姛"});
}
- catch (Exception)
+ catch (Exception ex)
{
-
- throw;
+ return Ok(new HttpReturnModel { Success = "1", Message = ex.ToString() });
+ throw ex;
}
}
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 1fefa33..5b90b7c 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -34,7 +34,7 @@
private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc
private readonly IPdaCrServer _daCrSvc;//PDA
private readonly IStockServer _stock; //搴撳瓨
- public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc,IPdaCrServer daCrSvc,IStockServer stock)
+ public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IPdaCrServer daCrSvc, IStockServer stock)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -82,7 +82,7 @@
/// <param name="model">鍏ュ簱鍗曞彿</param>
/// <returns></returns>
[HttpPost]
- public IActionResult FinishAsn(FinshVm model)
+ public IActionResult FinishAsn(FinshVm model)
{
try
{
@@ -97,7 +97,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, _config.MesHost + _config.MesAsnFinishUrl, _config.MesHost + _config.MesGetTokenUrl,model.UserNo,model.Password, int.Parse(userId));
+ _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, _config.MesHost + _config.MesAsnFinishUrl, _config.MesHost + _config.MesGetTokenUrl, model.UserNo, model.Password, int.Parse(userId));
return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
}
@@ -142,7 +142,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- [HttpPost]
+ [HttpPost]
public IActionResult FinishExportNotice(FinshVm model)
{
try
@@ -234,8 +234,8 @@
{
try
{
-
- OutCommanAgvDto agvRequest = _daCrSvc.AGVTask(type,taskno,positionStart,positionEnd, _config.AgvHost + _config.GenAgvSchedulingTask);
+
+ OutCommanAgvDto agvRequest = _daCrSvc.AGVTask(type, taskno, positionStart, positionEnd, _config.AgvHost + _config.GenAgvSchedulingTask);
if (agvRequest.Code != "0")
{
return Ok(new { code = 1, msg = "灏忚溅浠诲姟鎵ц澶辫触" });
@@ -294,7 +294,7 @@
{
logStr = $@".\log\ERP\鍏ュ簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
}
-
+
try
{
//log鏃ュ織璁板綍
@@ -337,20 +337,20 @@
{
logStr = $@".\log\MES\鍑哄簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
}
- else if(model.Origin == "ERP")
+ else if (model.Origin == "ERP")
{
logStr = $@".\log\ERP\鍑哄簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
}
-
+
try
{
//log鏃ュ織璁板綍
- if (logStr!="")
+ if (logStr != "")
{
var jsonData = JsonConvert.SerializeObject(model);
LogFile.SaveLogToFile($"鍑哄簱鍗曚笅鍙戯細( {jsonData} ),", logStr);
}
-
+
_exNoticeSvc.HttpAddExportNotice(model);
var data = new HttpReturnModel { Success = "0", Message = "鎴愬姛" };
@@ -362,12 +362,12 @@
}
return Ok(data);
-
-
+
+
}
catch (Exception e)
{
- var data = new HttpReturnModel { Success = "-1", Message = "澶辫触"+e.Message };
+ var data = new HttpReturnModel { Success = "-1", Message = "澶辫触" + e.Message };
if (logStr != "")
{
var jsonData = JsonConvert.SerializeObject(data);
@@ -398,7 +398,7 @@
var jsonData = JsonConvert.SerializeObject(model);
LogFile.SaveLogToFile($"閲婃斁澶囨枡鍖哄偍浣嶇姸鎬侊細( {jsonData} ),", logStr);
}
- _arrivalNoticeSvc.UpLocate(model.WareHouseNo,model.LocatNo);
+ _arrivalNoticeSvc.UpLocate(model.WareHouseNo, model.LocatNo);
var data = new HttpReturnModel { Success = "0", Message = "鎴愬姛" };
@@ -408,7 +408,7 @@
LogFile.SaveLogToFile($"閲婃斁澶囨枡鍖哄偍浣嶇姸鎬佽繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
}
return Ok(data);
-
+
}
catch (Exception e)
{
@@ -439,6 +439,7 @@
/// </summary>
/// <param name="model">鏉ユ簮淇℃伅</param>
/// <returns></returns>
+ [HttpPost]
public IActionResult ReLocateData(DigitalTwinModel model)
{
//璁板綍log
@@ -448,7 +449,7 @@
LogFile.SaveLogToFile($"搴撲綅淇℃伅鍙婅川閲忕姸鎬佸弽棣堬細( {jsonData} ),", logStr);
//鑾峰彇搴撳瓨淇℃伅
- List<ReLocateData> stocks = _stock.GetLocateList();
+ List<ReLocateDataModel> stocks = _stock.GetLocateList();
if (stocks.Count == 0)
{
--
Gitblit v1.8.0