From f2bc08e28dda7022202f07217f6a3c150f818af7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 20 一月 2025 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms

---
 Wms/Wms/Controllers/UpApiController.cs |   68 ++++++++++++++++++++++++++++++----
 1 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 0c805e3..45bbd85 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -13,6 +13,7 @@
 using WMS.IBLL.IBllCheckServer;
 using Model.ModelVm.BllCheckVm;
 using Microsoft.Extensions.Logging;
+using WMS.IBLL.IPdaServer;
 
 namespace Wms.Controllers
 {
@@ -28,12 +29,14 @@
         private readonly IExportNoticeServer _exNoticeSvc;//鍑哄簱鍗昐vc 
         private readonly IArrivalNoticeServer _arrivalNoticeSvc;
         private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc 
-        public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc)
+        private readonly IPdaCrServer _daCrSvc;//PDA
+        public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc,IPdaCrServer daCrSvc)
         {
             _config = setting.Value;
             _exNoticeSvc = exNoticeSvc;
             _arrivalNoticeSvc = arrivalNoticeServer;
             _stockCheckSvc = stockCheckSvc;
+            _daCrSvc = daCrSvc;
         }
         #endregion
 
@@ -74,7 +77,7 @@
         /// <param name="model">鍏ュ簱鍗曞彿</param>
         /// <returns></returns>
         [HttpPost]
-        public IActionResult FinishAsn(IdVm model) 
+        public IActionResult FinishAsn(FinshVm model) 
         {
             try
             {
@@ -89,7 +92,7 @@
                 {
                     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));
+                _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 = "鍏ュ簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
             }
@@ -134,8 +137,8 @@
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        [HttpPost]
-        public IActionResult FinishExportNotice(IdVm model)
+        [HttpPost]                                                                      
+        public IActionResult FinishExportNotice(FinshVm model)
         {
             try
             {
@@ -150,7 +153,7 @@
                 {
                     return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
                 }
-                _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, int.Parse(userId));
+                _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, model.UserNo, model.Password, int.Parse(userId));
                 return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
             }
             catch (Exception e)
@@ -209,8 +212,56 @@
             }
         }
 
-        //绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (鎵鐮佸悜杩芥函瑕佷俊鎭�)  
+        //绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (鎵鐮佸悜杩芥函瑕佷俊鎭�)
+        //
 
+
+        /// <summary>
+        /// 涓嬪彂AGV璋冨害浠诲姟
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult AGVTask(string type, string taskno, string positionStart, string positionEnd)
+        {
+            try
+            {
+                    
+                OutCommanAgvDto agvRequest =  _daCrSvc.AGVTask(type,taskno,positionStart,positionEnd, _config.AgvHost + _config.GenAgvSchedulingTask);
+                if (agvRequest.Code != "0")
+                {
+                    return Ok(new { code = 1, msg = "灏忚溅浠诲姟鎵ц澶辫触" });
+                }
+
+                return Ok(new { code = 1, msg = "AGV浠诲姟涓嬪彂鎴愬姛" });
+
+            }
+            catch (Exception e)
+            {
+                return Ok(new { code = 1, msg = e.Message });
+            }
+        }
+
+        /// <summary>
+        /// 涓嬪彂AGV鍙栨秷浠诲姟
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult cancelTask(string taskno)
+        {
+            try
+            {
+
+                _daCrSvc.cancelTask(taskno, _config.AgvHost + _config.CancelTask);
+                return Ok(new { code = 1, msg = "AGV浠诲姟鍙栨秷鎴愬姛" });
+
+            }
+            catch (Exception e)
+            {
+                return Ok(new { code = 1, msg = e.Message });
+            }
+        }
 
         #endregion
 
@@ -224,6 +275,7 @@
         [HttpPost]
         public IActionResult CreateAsn(AsnInfo model)
         {
+            // liudl Test
             var result = new HttpReturnModel { Success = "-1", Message = "" };
             var logStr = "";
             if (model.Origin == "MES")
@@ -244,7 +296,7 @@
                     LogFile.SaveLogToFile($"鍏ュ簱鍗曚笅鍙戯細( {jsonData} ),", logStr);
                 }
 
-                result = _arrivalNoticeSvc.HttpCreateAsn(model);
+                result = _arrivalNoticeSvc.HttpCreateAsn(model, _config.WcsHost + _config.AddOrderTaskUrl);
                 if (logStr != "")
                 {
                     var jsonData = JsonConvert.SerializeObject(result);

--
Gitblit v1.8.0