From 1e26a7575d9969e728b0aa01466f490409cb173c Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 18 十月 2024 18:41:30 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Wms/Wms/Controllers/UpApiController.cs | 221 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 171 insertions(+), 50 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 1e6feb4..0c805e3 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -12,6 +12,7 @@
using WMS.IBLL.IBllAsnServer;
using WMS.IBLL.IBllCheckServer;
using Model.ModelVm.BllCheckVm;
+using Microsoft.Extensions.Logging;
namespace Wms.Controllers
{
@@ -37,9 +38,38 @@
#endregion
#region 璋冪敤涓婃父绯荤粺鎺ュ彛
-
/// <summary>
- /// 鍏ュ簱鍗曞畬鎴愬洖浼�
+ /// 鍏ュ簱鍗曞叧闂�
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CloseAsn(IdVm model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ _arrivalNoticeSvc.CloseArrivalNotice(model.Id, int.Parse(userId));
+
+ return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞叧鍗曟垚鍔�" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// 鍏ュ簱鍗曞鏍稿苟鍥炰紶
/// </summary>
/// <param name="model">鍏ュ簱鍗曞彿</param>
/// <returns></returns>
@@ -59,29 +89,48 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _arrivalNoticeSvc.CloseArrivalNotice(model.Id, int.Parse(userId));
-
- if (bolls == "")
- {
- //绯荤粺瀵规帴鍚庢斁寮�
- //var bl =_ArrivalNoticeSvc.FinishAsn(model.Id,_config.ErpHost+_config.AsnFinishUrl,int.Parse(userId));
- //if (bl)
- //{
- return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞叧鍗曚笂浼犳垚鍔�" });
- //}
- //return Ok(new { code = 1, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔熶絾涓婁紶澶辫触" });
- }
- return Ok(new { code = 1, msg = "鍏ュ簱鍗曞叧鍗曞け璐�" });
+ _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, _config.MesHost + _config.MesAsnFinishUrl, _config.MesHost + _config.MesGetTokenUrl, int.Parse(userId));
+ return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
}
catch (Exception e)
{
return Ok(new { code = 1, msg = e.Message });
}
}
-
+
/// <summary>
- /// 瀹屾垚鍑哄簱鍗曟嵁 //鍑哄簱鍗曞叧闂弽棣�
+ /// 瀹屾垚/鍏抽棴鍑哄簱鍗曟嵁
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CloseExportNotice(IdVm model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ _exNoticeSvc.CloseExportNotice(model.Id, int.Parse(userId));
+
+ return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔�" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// //鍑哄簱鍗曞鏍稿苟涓婁紶
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -101,20 +150,8 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _exNoticeSvc.CloseExportNotice(model.Id, int.Parse(userId));
- if (bolls)
- {
- //绯荤粺瀵规帴鍚庢斁寮�
- //var bl =_exNoticeSvc.FinishSo(model.Id,_config.ErpHost + _config.SoFinishUrl, int.Parse(userId));
- //if (bl)
- //{
- return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曞叧鍗曚笂浼犳垚鍔�" });
- //}
- //return Ok(new { code = 1, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔熶絾涓婁紶澶辫触" });
- }
-
- return Ok(new { code = 1, msg = "鍑哄簱鍗曞叧鍗曞け璐�" });
-
+ _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, int.Parse(userId));
+ return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
}
catch (Exception e)
{
@@ -187,27 +224,42 @@
[HttpPost]
public IActionResult CreateAsn(AsnInfo model)
{
- var result = new ErpModel { Success = -1, Message = "" };
+ var result = new HttpReturnModel { Success = "-1", Message = "" };
+ var logStr = "";
+ if (model.Origin == "MES")
+ {
+ logStr = $@".\log\MES\鍏ュ簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ }
+ else if (model.Origin == "ERP")
+ {
+ logStr = $@".\log\ERP\鍏ュ簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ }
+
try
{
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
+ //log鏃ュ織璁板綍
+ if (logStr != "")
{
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"鍏ュ簱鍗曚笅鍙戯細( {jsonData} ),", logStr);
}
- result = _arrivalNoticeSvc.CreateAsn(model);
-
+ result = _arrivalNoticeSvc.HttpCreateAsn(model);
+ if (logStr != "")
+ {
+ var jsonData = JsonConvert.SerializeObject(result);
+ LogFile.SaveLogToFile($"鍏ュ簱鍗曚笅鍙戣繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
+ }
return Ok(result);
}
catch (Exception e)
{
result.Message = e.Message;
+ if (logStr != "")
+ {
+ var jsonData = JsonConvert.SerializeObject(result);
+ LogFile.SaveLogToFile($"鍏ュ簱鍗曚笅鍙戣繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
+ }
return Ok(result);
}
}
@@ -220,26 +272,95 @@
[HttpPost]
public IActionResult CreateSo(SoInfo model)
{
+ var logStr = "";
+ if (model.Origin == "MES")
+ {
+ logStr = $@".\log\MES\鍑哄簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ }
+ else if(model.Origin == "ERP")
+ {
+ logStr = $@".\log\ERP\鍑哄簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ }
+
try
- {
- var bl = _exNoticeSvc.ErpAddExportNotice(model);
- if (bl)
+ {
+ //log鏃ュ織璁板綍
+ if (logStr!="")
{
- return Ok(new ErpModel { Success = 0, Message = "鎴愬姛"});
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"鍑哄簱鍗曚笅鍙戯細( {jsonData} ),", logStr);
}
- else
+
+ _exNoticeSvc.HttpAddExportNotice(model);
+
+ var data = new HttpReturnModel { Success = "0", Message = "鎴愬姛" };
+
+ if (logStr != "")
{
- return Ok(new ErpModel { Success = -1, Message = "澶辫触" });
+ var jsonData = JsonConvert.SerializeObject(data);
+ LogFile.SaveLogToFile($"鍑哄簱鍗曚笅鍙戣繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
}
+
+ return Ok(data);
+
}
catch (Exception e)
{
- return Ok(new ErpModel { Success = -1, Message = e.Message });
+ var data = new HttpReturnModel { Success = "-1", Message = "澶辫触"+e.Message };
+ if (logStr != "")
+ {
+ var jsonData = JsonConvert.SerializeObject(data);
+ LogFile.SaveLogToFile($"鍑哄簱鍗曚笅鍙戣繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
+ }
+ return Ok(data);
}
}
- //绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (璧嬬爜鎴栬拷婧笅鍙戝埌wms)
+ /// <summary>
+ /// 閲婃斁澶囨枡鍖哄偍浣嶇姸鎬丣C24
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult UpLocate(UpLocateModel model)
+ {
+ //璁板綍log
+ var logStr = "";
+ if (model.Origin == "MES")
+ {
+ logStr = $@".\log\MES\閲婃斁澶囨枡鍖哄偍浣嶇姸鎬�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ }
+ try
+ {
+ if (logStr != "")
+ {
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"閲婃斁澶囨枡鍖哄偍浣嶇姸鎬侊細( {jsonData} ),", logStr);
+ }
+ _arrivalNoticeSvc.UpLocate(model.WareHouseNo,model.LocatNo);
+
+ var data = new HttpReturnModel { Success = "0", Message = "鎴愬姛" };
+
+ if (logStr != "")
+ {
+ var jsonData = JsonConvert.SerializeObject(data);
+ LogFile.SaveLogToFile($"閲婃斁澶囨枡鍖哄偍浣嶇姸鎬佽繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
+ }
+ return Ok(data);
+
+ }
+ catch (Exception e)
+ {
+ var data = new HttpReturnModel { Success = "0", Message = "澶辫触锛�" + e.Message };
+ if (logStr != "")
+ {
+ var jsonData = JsonConvert.SerializeObject(data);
+ LogFile.SaveLogToFile($"閲婃斁澶囨枡鍖哄偍浣嶇姸鎬佽繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
+ }
+ return Ok(data);
+ }
+ }
+
//璐ㄦ缁撴灉涓嬪彂鎺ュ彛
--
Gitblit v1.8.0