From 157abc191c34e57c1b958ae74fc3de6518ca8a30 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 28 二月 2025 11:06:36 +0800
Subject: [PATCH] 修改客户需求

---
 Wms/Wms/Controllers/UpApiController.cs |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 1fefa33..5b90b7c 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -34,7 +34,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 +82,7 @@
         /// <param name="model">鍏ュ簱鍗曞彿</param>
         /// <returns></returns>
         [HttpPost]
-        public IActionResult FinishAsn(FinshVm model) 
+        public IActionResult FinishAsn(FinshVm model)
         {
             try
             {
@@ -97,7 +97,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 +142,7 @@
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        [HttpPost]                                                                      
+        [HttpPost]
         public IActionResult FinishExportNotice(FinshVm model)
         {
             try
@@ -234,8 +234,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 +294,7 @@
             {
                 logStr = $@".\log\ERP\鍏ュ簱鍗曚笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
             }
-            
+
             try
             {
                 //log鏃ュ織璁板綍 
@@ -337,20 +337,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 +362,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 +398,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 +408,7 @@
                     LogFile.SaveLogToFile($"閲婃斁澶囨枡鍖哄偍浣嶇姸鎬佽繑鍥炲弬鏁帮細( {jsonData} ),", logStr);
                 }
                 return Ok(data);
-                 
+
             }
             catch (Exception e)
             {
@@ -439,6 +439,7 @@
         /// </summary>
         /// <param name="model">鏉ユ簮淇℃伅</param>
         /// <returns></returns>
+        [HttpPost]
         public IActionResult ReLocateData(DigitalTwinModel model)
         {
             //璁板綍log
@@ -448,7 +449,7 @@
             LogFile.SaveLogToFile($"搴撲綅淇℃伅鍙婅川閲忕姸鎬佸弽棣堬細( {jsonData} ),", logStr);
 
             //鑾峰彇搴撳瓨淇℃伅
-            List<ReLocateData> stocks = _stock.GetLocateList();
+            List<ReLocateDataModel> stocks = _stock.GetLocateList();
 
             if (stocks.Count == 0)
             {

--
Gitblit v1.8.0