From 1650f3fe1467d21074b597042861c46f3a8c4447 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 01 四月 2025 10:11:24 +0800
Subject: [PATCH] 问题修改
---
Wms/Wms/Controllers/UpApiController.cs | 76 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 1fefa33..c5dab11 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -17,6 +17,7 @@
using WMS.IBLL.IDataServer;
using Model.ModelDto.DataDto;
using System.Collections.Generic;
+using Model.ModelDto.LogDto;
namespace Wms.Controllers
{
@@ -34,7 +35,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 +83,7 @@
/// <param name="model">鍏ュ簱鍗曞彿</param>
/// <returns></returns>
[HttpPost]
- public IActionResult FinishAsn(FinshVm model)
+ public IActionResult FinishAsn(FinshVm model)
{
try
{
@@ -97,7 +98,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 +143,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- [HttpPost]
+ [HttpPost]
public IActionResult FinishExportNotice(FinshVm model)
{
try
@@ -234,8 +235,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 +295,7 @@
{
logStr = $@".\log\ERP\鍏ュ簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
}
-
+
try
{
//log鏃ュ織璁板綍
@@ -337,20 +338,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 +363,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 +399,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 +409,7 @@
LogFile.SaveLogToFile($"閲婃斁澶囨枡鍖哄偍浣嶇姸鎬佽繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
}
return Ok(data);
-
+
}
catch (Exception e)
{
@@ -439,6 +440,7 @@
/// </summary>
/// <param name="model">鏉ユ簮淇℃伅</param>
/// <returns></returns>
+ [HttpPost]
public IActionResult ReLocateData(DigitalTwinModel model)
{
//璁板綍log
@@ -448,7 +450,7 @@
LogFile.SaveLogToFile($"搴撲綅淇℃伅鍙婅川閲忕姸鎬佸弽棣堬細( {jsonData} ),", logStr);
//鑾峰彇搴撳瓨淇℃伅
- List<ReLocateData> stocks = _stock.GetLocateList();
+ List<ReLocateDataModel> stocks = _stock.GetLocateList();
if (stocks.Count == 0)
{
@@ -458,6 +460,46 @@
return Ok(stocks);
}
+ /// <summary>
+ /// 鏁板瓧瀛敓绯荤粺搴撳瓨璐ㄩ噺鐘舵�佸弽棣�
+ /// </summary>
+ /// <param name="model">鏉ユ簮淇℃伅</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult ReLogData(DigitalTwinModel model)
+ {
+
+ //璁板綍log
+ var logStr = "";
+ logStr = $@".\log\鏁板瓧瀛敓\鎿嶄綔鏃ュ織淇℃伅鍙嶉" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"鎿嶄綔鏃ュ織淇℃伅鍙嶉锛�( {jsonData} ),", logStr);
+ try
+ {
+ //鑾峰彇搴撳瓨淇℃伅
+ List<OperationDto> stocks = _stock.ReLogData();
+
+ if (stocks.Count == 0)
+ {
+ var data = new HttpReturnModel { Success = "0", Message = "褰撳墠鏃犳搷浣滀俊鎭�" };
+ return Ok(data);
+ }
+ return Ok(stocks);
+
+ }
+ catch (Exception e)
+ {
+ var data = new HttpReturnModel { Success = "0", Message = "澶辫触锛�" + e.Message };
+ if (logStr != "")
+ {
+ jsonData = JsonConvert.SerializeObject(data);
+ LogFile.SaveLogToFile($"鎿嶄綔鏃ュ織淇℃伅鍙嶉锛岃繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
+ }
+ return Ok(data);
+ }
+
+ }
+
#endregion
}
--
Gitblit v1.8.0