From fee75dfd690506efb6bb67e1a91a545efb527c1a Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期五, 17 一月 2025 16:00:12 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 8 ++++----
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 7 +++++++
Wms/Model/InterFaceModel/AsnModels.cs | 1 +
Wms/Wms/Controllers/DownApiController.cs | 26 ++++++++++++++++++++++++++
4 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/Wms/Model/InterFaceModel/AsnModels.cs b/Wms/Model/InterFaceModel/AsnModels.cs
index 4f14cec..eed1ad3 100644
--- a/Wms/Model/InterFaceModel/AsnModels.cs
+++ b/Wms/Model/InterFaceModel/AsnModels.cs
@@ -105,6 +105,7 @@
public class BoxInfoCheck
{
+ public string BoxNo { get; set; }
public string PalletNo { get; set; }
public string TaskNo { get; set; }
}
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 9cb3aac..dcd9c1d 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -3809,10 +3809,10 @@
}
/// <summary>
- /// 鑾峰彇鎷嗗灈鍒嗘嫞涓绘壂绠辩爜鍑哄簱
+ /// 鎷嗗灈鍒嗘嫞涓绘壂绠辩爜鍑哄簱
/// </summary>
- /// <param name="model">鎷嗗灈鎵樼洏鍙峰拰WCS浠诲姟鍙�</param>
- /// <returns>鎷嗗灈鎵樼洏淇℃伅</returns>
+ /// <param name="model">绠卞彿</param>
+ /// <returns>鍑哄簱鍒嗘嫞鍙�</returns>
public string BoxInfoExportWcs(string boxno)
{
try
@@ -3995,7 +3995,7 @@
//淇敼鍑哄簱鍗曚俊鎭�
Db.Updateable(notice).ExecuteCommand();
- return "";
+ return allot.LoadingAddre;
}
catch (Exception e)
{
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index e6f2d61..59d9535 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -223,5 +223,12 @@
/// <returns>鎷嗗灈鎵樼洏淇℃伅</returns>
public RequestBoxInfoCheck BoxInfoCheckWcs(BoxInfoCheck model);
+
+ /// <summary>
+ /// 鎷嗗灈鍒嗘嫞涓绘壂绠辩爜鍑哄簱
+ /// </summary>
+ /// <param name="boxno"></param>
+ /// <returns></returns>
+ string BoxInfoExportWcs(string boxno);
}
}
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index d1d9bb1..2ddbb5d 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -724,6 +724,32 @@
}
+
+ /// <summary>
+ /// 鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult ResultBoxInfoExportWcs(BoxInfoCheck model)
+ {
+ var logStr = $@".\log\WCS\WCS鐢宠鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣淇℃伅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ try
+ {
+ //杩斿洖鍑哄簱鍒嗘嫞瑁呰溅鍙�
+ var list = _exNoticeSvc.BoxInfoExportWcs(model.BoxNo);
+ return Ok(new { Success = 1, Message = "鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣鎴愬姛", loadubgAddre = list });
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WCS鐢宠鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣寮傚父杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+
+ }
+
#region AGV
--
Gitblit v1.8.0