From 236ce686ed03f6cb786a5acd7492339bc2ea16ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:03:14 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/Wms/Controllers/DownApiController.cs | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index d1d9bb1..8b596bf 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
@@ -754,7 +780,16 @@
switch (orderType)
{
case "0"://鍏ュ簱浠诲姟鎵ц
- _stockSvc.ArriveFinish(model.TaskCode);
+ if (model.TaskTyp == "mid") //AGV鍒拌揪鍏ュ簱鍙ｏ紝璇锋眰鏀捐揣
+ {
+ //涓嬪彂WCS鏀捐揣璇锋眰
+
+ }
+ else if (model.TaskTyp == "end")//AGV鏀捐揣鍒板叆搴撳彛瀹屾垚
+ {
+ _stockSvc.ArriveFinish(model.TaskCode);
+ }
+
break;
case "1"://鍑哄簱浠诲姟鎵ц
@@ -784,7 +819,7 @@
}
}
-
+
#endregion
--
Gitblit v1.8.0