林豪 左 2 years ago
parent
commit
2c63904bf5

+ 1 - 1
ServiceCenter/Logs/LogHub.cs

@@ -51,7 +51,7 @@ namespace ServiceCenter.Logs
             {
                 path = $"D:\\WCSLogs\\{DateTime.Now.yyyyMMdd()}\\接口日志\\",
                 Title = $"{title}.txt",
-                Con = $"{con}\n"
+                Con = $"{DateTime.Now.yyyyMMddhhmmssf()}--{con}\n"
             }));
         }
 

+ 4 - 7
ServiceCenter/ServiceCenter.csproj

@@ -17,15 +17,12 @@
   
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
+    <PackageReference Include="PlcSiemens" Version="1.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\PLC.Siemens\PlcSiemens.csproj" />
-    <ProjectReference Include="..\WCS.Core\WCS.Core.csproj" />
-    <ProjectReference Include="..\WCS.Entity.Protocol\WCS.Entity.Protocol.csproj" />
-    <ProjectReference Include="..\WCS.Entity\WCS.Entity.csproj" />
+    <PackageReference Include="WCS.Core" Version="1.0.1.10" />
+    <PackageReference Include="WCS.Entity" Version="1.0.2" />
+    <PackageReference Include="WCS.Entity.Protocol" Version="1.0.1" />
   </ItemGroup>
 
 </Project>

+ 3 - 3
ServiceCenter/WebApi/APICaller.cs

@@ -82,7 +82,7 @@ namespace ServiceCenter.WebApi
         private static string HttpApi(string url, string jsonstr, string type)
         {
             var name = url.Split("/").Last();
-            LogHub.InterfacePublish(name, $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--接口{name}传参---------{JsonConvert.SerializeObject(jsonstr)}");
+            LogHub.InterfacePublish(name, $"[{Thread.CurrentThread.ManagedThreadId}]--接口{name}传参---------{JsonConvert.SerializeObject(jsonstr)}");
             try
             {
                 var sw = new Stopwatch();
@@ -102,13 +102,13 @@ namespace ServiceCenter.WebApi
                 {
                     var res = reader.ReadToEnd();
                     sw.Stop();
-                    LogHub.InterfacePublish(name, $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--接口{name}调用耗时:{sw.ElapsedMilliseconds}---------{JsonConvert.SerializeObject(res)}");
+                    LogHub.InterfacePublish(name, $"[{Thread.CurrentThread.ManagedThreadId}]--接口{name}调用耗时:{sw.ElapsedMilliseconds}---------{JsonConvert.SerializeObject(res)}");
                     return res;
                 }
             }
             catch (Exception ex)
             {
-                LogHub.InterfacePublish(name, $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--接口{name}调用错误:{ex.StackTrace}");
+                LogHub.InterfacePublish(name, $"[{Thread.CurrentThread.ManagedThreadId}]--接口{name}调用错误:{ex.StackTrace}");
                 throw new Exception(ex.Message);
             }
         }

+ 1 - 1
WCS.WorkEngineering/Systems/一楼出库工位处理系统.cs

@@ -49,7 +49,7 @@ namespace WCS.WorkEngineering.Systems
                                 if (agv == null)
                                 {
                                 }
-                                else if (agv.Status >= AGVTaskStatus.Complete3)
+                                else if (agv.AgvStatus >= AGVTaskStatus.Complete3)
                                 {
                                     result = true;
                                 }