传数据不需要lineCode或line

LocalhostMES/Controller/MesApiClient.cs

@@ -1,4 +1,5 @@
-using LocalhostMES.DataBase;
+using LocalhostMES.Core;
+using LocalhostMES.DataBase;
 using LocalhostMES.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -53,7 +54,7 @@ namespace LocalhostMES.Controller
             // 2.2.2 Headers - 需要token
             var requestJson = JsonConvert.SerializeObject(request);
             var content = new StringContent(requestJson, Encoding.UTF8, "application/json");
-            var requestMessage = new HttpRequestMessage(HttpMethod.Post, $"https://uat-mom-jh-handle-api.leapmotor.com:443/app-mom-mes/api/battery/sn/print")
+            var requestMessage = new HttpRequestMessage(HttpMethod.Post, $"https://mom-jh-annex-api.leapmotor.com/app-mom-mes/api/battery/sn/print \r\n")
             {
                 Content = content
             };
@@ -63,16 +64,19 @@ namespace LocalhostMES.Controller
             ApiResponse<SnPrintResponseData> res = await ParseResponseAsync<ApiResponse<SnPrintResponseData>>(response);
 
             List<SnInfo> inSn = new List<SnInfo>();
-            for (int i = 0; i < res.data.Sn.Count; i++)
+            if (res.data != null)
             {
-                inSn.Add(new SnInfo() 
+                for (int i = 0; i < res.data.Sn.Count; i++)
                 {
-                 WorkOrderNo=res.data.WorkOrderNo,
-                    Sn = res.data.Sn[i].Sn,
-                     GenerateTime=DateTime.Now,
-                      IsUsed=false,
-                       PrintType="0"     
-                });
+                    inSn.Add(new SnInfo()
+                    {
+                        WorkOrderNo = res.data.WorkOrderNo,
+                        Sn = res.data.Sn[i].Sn,
+                        GenerateTime = DateTime.Now,
+                        IsUsed = false,
+                        PrintType = "0"
+                    });
+                }
             }
             if (inSn.Count != 0) 
             {
@@ -104,7 +108,7 @@ namespace LocalhostMES.Controller
         {
             var requestJson = JsonConvert.SerializeObject(request);
             var content = new StringContent(requestJson, Encoding.UTF8, "application/json");
-            var requestMessage = new HttpRequestMessage(HttpMethod.Post, $"https://uat-mom-jh-handle-api.leapmotor.com/app-mom-mes/api/task/receive/sn/keyComponent" )
+            var requestMessage = new HttpRequestMessage(HttpMethod.Post, $"https://mom-jh-annex-api.leapmotor.com/app-mom-mes/api/task/receive/sn/keyComponent " )
             {
                 Content = content
             };
@@ -132,7 +136,7 @@ namespace LocalhostMES.Controller
             var requestJson = JsonConvert.SerializeObject(request);
             var content = new StringContent(requestJson, Encoding.UTF8, "application/json");
 
-            var requestMessage = new HttpRequestMessage(HttpMethod.Post, $"https://uat-mom-jh-handle-api.leapmotor.com/app-mom-mes/api/task/receive/manualSave")
+            var requestMessage = new HttpRequestMessage(HttpMethod.Post, $"https://mom-jh-annex-api.leapmotor.com/app-mom-mes/api/task/receive/manualSave ")
             {
                 Content = content
             };
@@ -141,6 +145,8 @@ namespace LocalhostMES.Controller
             requestMessage.Headers.Add("token", _token);
 
             var response = await _httpClient.SendAsync(requestMessage);
+            LogHelper.WriteLogInfo(requestMessage.ToString());
+           
             return await ParseResponseAsync<ApiResponse<bool?>>(response);
         }
 
@@ -158,13 +164,24 @@ namespace LocalhostMES.Controller
         #region 辅助方法
         private async Task<T> ParseResponseAsync<T>(HttpResponseMessage response) where T : class
         {
-            if ( response.IsSuccessStatusCode )
+            LogHelper.WriteLogInfo(response.ToString());
+            if ( response.IsSuccessStatusCode)
             {
                 var json = await response.Content.ReadAsStringAsync();
                 var jObject = JObject.Parse(json);
+                if (jObject.ContainsKey("data"))
+                {
+                    string str = jObject["data"].ToString();
+                    if (jObject["data"].ToString() == "null"|| jObject["data"].ToString().Length==0)
+                    {
+                        // 添加新属性
+                        jObject["data"] = "true";
+                    }
+                }
                 // 将JObject转换回字符串
                 string newJsonString = jObject.ToString();
-                return JsonConvert.DeserializeObject<T>(json);
+              
+                return JsonConvert.DeserializeObject<T>(newJsonString);
             }
             else
             {
@@ -174,13 +191,15 @@ namespace LocalhostMES.Controller
                     var jObject = JObject.Parse(errorJson);
                     if (jObject.ContainsKey("data"))
                     {
-                        if (jObject["data"].ToString() == "null")
+                        if (jObject["data"].ToString() == "null" || jObject["data"].ToString().Length == 0)
                         {
                             // 添加新属性
                             jObject["data"] = "false";
                         }
                     }
-                    return JsonConvert.DeserializeObject<T>(errorJson);
+                    // 将JObject转换回字符串
+                    string newJsonString = jObject.ToString();
+                    return JsonConvert.DeserializeObject<T>(newJsonString);
                 }
                 catch
                 {

LocalhostMES/Controller/MesController.cs

@@ -19,7 +19,7 @@ namespace LocalhostMES.Controller
         private static readonly Random _random = new Random();
         private static int _snCounter = 1;
         private Management management;
-
+        
         public MesController()
         {
             management = Management.GetManagement();
@@ -179,7 +179,7 @@ namespace LocalhostMES.Controller
                     var Manualsninfo = DatabaseHelper.SelectSnInfo(request.workOrderNo);
                     DatabaseHelper.InsertSnInfo(new SnInfo()
                     {
-                        Sn = "000001"+DateCodeConverter.GetYearCode(DateTime.Now.Year) +
+                        Sn = "000001" +DateCodeConverter.GetYearCode(DateTime.Now.Year) +
                              DateCodeConverter.GetMonthCode(DateTime.Now.Month) +
                              DateCodeConverter.GetDayCode(DateTime.Now.Day) +
                              "00000" + Manualsninfo.Count,
@@ -195,7 +195,7 @@ namespace LocalhostMES.Controller
                 if (sninfo.Count == 0)
                 {
                     ApiResponse<SnPrintResponseData> mesres = await management.ApiClient.RequestSnPrintAsync(request);
-                    if (mesres.success && mesres.data.Sn.Count != 0)
+                    if (mesres.success && mesres.data!=null&& mesres.data.Sn.Count != 0)
                     {
                         for (int i = 0; i < mesres.data.Sn.Count; i++)
                         {
@@ -401,15 +401,18 @@ namespace LocalhostMES.Controller
                 }
                 if (management.IsLocalhostMode)
                 {
+                    LogHelper.WriteLogInfo($"收到请求： 接收SN和关键件  成功");
                     return Ok(new ApiResponse<bool?>() { data=true} );
                 }
                 var okresponse = await management.ApiClient.SendSnComponentAsync(request);
                 if (okresponse.success && okresponse.code == "200")
                 {
+                    LogHelper.WriteLogInfo($"收到请求： 接收SN和关键件  成功");
                     return Ok(okresponse);
                 }
                 else
                 {
+                    LogHelper.WriteLogInfo($"收到请求： 接收SN和关键件  失败\r\n"+ okresponse.ToString());
                     okresponse.success = false;
                     return Content(System.Net.HttpStatusCode.InternalServerError, okresponse);
                 }
@@ -468,6 +471,7 @@ namespace LocalhostMES.Controller
         {
             try
             {
+                LogHelper.WriteLogInfo($"收到请求：接收工件加工参数 ");
                 // 验证请求头
                 if (!ValidateHeaders())
                 {
@@ -511,9 +515,11 @@ namespace LocalhostMES.Controller
                         traceId = Guid.NewGuid().ToString("N").Substring(0, 24),
                         data = true
                     };
+                    LogHelper.WriteLogInfo($"收到请求：接收工件加工参数  成功");
                     return Ok(response);
                 }
-                var mesres = management.ApiClient.SendProcessParametersAsync(request);
+                var mesres =await management.ApiClient.SendProcessParametersAsync(request);
+                LogHelper.WriteLogInfo($"收到请求：接收工件加工参数  成功");
                 return Ok(mesres);
             }
             catch (Exception ex)

LocalhostMES/Controller/WebApiService.cs

@@ -32,7 +32,7 @@ namespace LocalhostMES.Controller
         {
             _port = port;
             _baseUrl = $"http://192.168.1.26:{port}";
-            _startOptions = new StartOptions { Urls = { $"http://192.168.1.26:{port}" } };//$"http://10.157.15.51:{port}", 
+            _startOptions = new StartOptions { Urls = { $"http://192.168.1.26:{port}",$"http://10.157.15.51:{port}" } };//", 
 
         }
         public async Task StartAsync()

LocalhostMES/ViewModels/MainViewModel.cs

@@ -38,9 +38,9 @@ namespace LocalhostMES.ViewModels
 
         private string  _ApiUrl ="http://localhost:5000";
         public string ApiUrl { get => _ApiUrl; set { SetProperty(ref _ApiUrl, value); } }
-        private string  _AppKey = "API_HANDLE";
+        private string  _AppKey = "API_XXM";
         public string AppKey { get => _AppKey; set { SetProperty(ref _AppKey, value); } }
-        private string _Token = "0575d02f82ee7e8aee232933943e6adb";
+        private string _Token = "7c5766afa3ca82f8a21af120f9b1cca6d";
         public string Token { get => _Token; set { SetProperty(ref _Token, value); } }