fix

DBHelper/DBHelper.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Logs\Logs.csproj" />
+    <ProjectReference Include="..\Logs\WCS.Logs.csproj" />
   </ItemGroup>
 
 </Project>

Logs/Logs.csproj

@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Nullable>enable</Nullable>
-    <AssemblyVersion>1.0.0.2</AssemblyVersion>
-    <FileVersion>1.0.0.2</FileVersion>
-    <UserSecretsId>0d0d7a9a-e261-49ea-a9ce-953f029a7a13</UserSecretsId>
-    <IsPublishable>True</IsPublishable>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.2</Version>
-    <Description>尝试适配日志可视化组件</Description>
-    <PackageReleaseNotes>尝试适配日志可视化组件</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.14" />
-  </ItemGroup>
-
-</Project>

Projects/永冠OPP/WCS.Entity.Protocol/WCS.Entity.Protocol.csproj

@@ -2,10 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
+    <Version>1.0.1</Version>
+    <Description>2022/8/29 更新</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\WCS.Entity\WCS.Entity.csproj" />
+    <PackageReference Include="WCS.Entity" Version="1.0.2" />
   </ItemGroup>
 
 </Project>

Projects/永冠OPP/WCS.Service/DeviceExtentions.cs

@@ -1,139 +1,13 @@
 using DBHelper_SqlSugar;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
 using WCS.Entity.Protocol.Station;
-using WCS.Service.Extensions;
 
 namespace WCS.Service
 {
     public static class DeviceExtentions
     {
-        public static IBCR80 BCR(this WCS_DEVICE source)
-        {
-            var dev = Device.Find("BCR" + source.CODE);
-            return dev.DEVICEPROTOCOLS.First().Data<IBCR80>();
-        }
-
-        public static short PalletType(this WCS_DEVICE source)
-        {
-            return (short)source.Get<int>("PalletType");
-        }
-
-        public static short ProductLine(this WCS_DEVICE source)
-        {
-            return (short)source.Get<int>("ProductLine");
-        }
-
-        public static short WorkShop(this WCS_DEVICE source)
-        {
-            return (short)source.Get<int>("WorkShop");
-        }
-
-        /// <summary>
-        /// 获取从source到endaddr的路径中的所有位置
-        /// </summary>
-        /// <param name="source">起始位置</param>
-        /// <param name="endAddr">目标位置</param>
-        /// <param name="condition">路径筛选条件</param>
-        /// <returns></returns>
-        public static List<WCS_DEVICE> GetPath(this WCS_DEVICE source, string endAddr, Func<List<WCS_DEVICE>, bool> condition = null)
-        {
-            var q = source.PATHS.Where(v => v.START == source & v.END.CODE.Contains(endAddr.ToUpper()))
-                .Select(v => v.PATH.Split('-').Select(v => Device.Find(v)).ToList());
-
-            if (condition != null)
-                q = q.Where(condition);
-
-            return q.FirstOrDefault();
-        }
-
-        /// <summary>
-        /// 获取从source到endaddr的路径中的第一个位置
-        /// </summary>
-        /// <param name="source">起始位置</param>
-        /// <param name="endAddr">目标位置</param>
-        /// <param name="condition">路径筛选条件</param>
-        /// <returns></returns>
-        public static WCS_DEVICE GetPath(this WCS_DEVICE source, string endAddr)
-        {
-            var q = source.PATHS.Where(v => v.START == source && v.END.CODE.Contains(endAddr.ToUpper()))
-                .Select(v => v.PATH.Split('-').Select(v => Device.Find(v)).ToList());
-
-            return q.FirstOrDefault().FirstOrDefault();
-        }
-
-        public static WCS_DEVICE GetNext(this WCS_DEVICE source, string endAddr)
-        {
-            return source.GetNext(endAddr, null);
-        }
-
-        /// <summary>
-        /// 获取从source到endaddr的路径中的下一个位置
-        /// </summary>
-        /// <param name="source">起始位置</param>
-        /// <param name="endAddr">目标位置</param>
-        /// <param name="condition">路径筛选条件</param>
-        /// <returns></returns>
-        public static WCS_DEVICE GetNext(this WCS_DEVICE source, string endAddr, Func<List<WCS_DEVICE>, bool> condition)
-        {
-            var path = source.GetPath(endAddr, condition);
-            if (Ltc.Do(path, v => v == null || v.Count == 0))
-                return null;
-
-            if (source.IsConv())
-            {
-                var obj = path.FirstOrDefault(v => !v.IsConv());
-                if (obj == null)
-                {
-                    return path.Last();
-                }
-                else if (obj.IsRGV())
-                {
-                    var target = path.Skip(path.IndexOf(obj) + 1).FirstOrDefault();
-                    return target;
-                }
-                else
-                    return null;
-            }
-            else
-            {
-                return path.First();
-            }
-        }
-
-        public static bool IsDevGroup(this WCS_DEVICE source)
-        {
-            return source.CODE.Contains("G");
-        }
-
-        public static bool IsRGV(this WCS_DEVICE source)
-        {
-            return source.DEVICEPROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IRGV520).AssemblyQualifiedName);
-        }
-
-        public static bool IsConv(this WCS_DEVICE source)
-        {
-            return source.DEVICEPROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IStation521).AssemblyQualifiedName);
-        }
-
-        /// <summary>
-        /// 是否堆垛机
-        /// </summary>
-        /// <param name="source"></param>
-        /// <returns></returns>
-        public static bool IsSC(this WCS_DEVICE source)
-        {
-            return source.DEVICEPROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(ISRM520).AssemblyQualifiedName);
-        }
-
-        public static bool IsTunnel(this WCS_DEVICE source)
-        {
-            return source.DEVICEPROTOCOLS.Count == 0 && source.CODE.StartsWith("T");
-        }
     }
 
     public static class TaskExtentions

Projects/永冠OPP/WCS.Service/WCS.Service.csproj

@@ -41,11 +41,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\DBHelper-SqlSugar\DBHelper-SqlSugar.csproj" />
-    <ProjectReference Include="..\..\..\Logs\Logs.csproj" />
     <ProjectReference Include="..\..\..\Virtual_PLC\Virtual_PLC.csproj" />
     <ProjectReference Include="..\..\..\WCS.Core\WCS.Core.csproj" />
-    <ProjectReference Include="..\..\..\WCS.Entity\WCS.Entity.csproj" />
     <ProjectReference Include="..\WCS.Entity.Protocol\WCS.Entity.Protocol.csproj" />
   </ItemGroup>
 

WCS Pedestal.sln

@@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Service", "Projects\永冠OPP\WCS.Service\WCS.Service.csproj", "{0C1638C8-68C1-4493-A731-186E58CEC4F0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logs", "Logs\Logs.csproj", "{31B6E0FC-524C-4B52-9088-6EA4690E6B36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Logs", "Logs\WCS.Logs.csproj", "{31B6E0FC-524C-4B52-9088-6EA4690E6B36}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLC.Siemens", "PLC.Siemens\PLC.Siemens.csproj", "{8F6C4A79-98EA-4019-B72A-29290328185A}"
 EndProject
@@ -36,7 +36,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlSugar", "..\..\..\..\开
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Virtual_PLC", "Virtual_PLC\Virtual_PLC.csproj", "{FFE12700-0A7F-474B-8B0B-ABC209C79383}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkEngineering", "WorkEngineering\WorkEngineering.csproj", "{AE1C15AB-2C36-4EC1-A7FE-D7673D5F3656}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkEngineering", "WorkEngineering\WorkEngineering.csproj", "{AE1C15AB-2C36-4EC1-A7FE-D7673D5F3656}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

WCS.Core/WCS.Core.csproj

@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="FreeRedis" Version="0.3.5" />
     <PackageReference Include="HslCommunication" Version="6.2.2" />
-    <PackageReference Include="Logs" Version="1.0.0.1" />
+    <PackageReference Include="WCS.Logs" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

WCS.Entity/WCS.Entity.csproj

@@ -2,10 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
+    <Version>1.0.2</Version>
+    <Description>2022/8/29更新</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DBHelper-SqlSugar" Version="1.0.0" />
+    <PackageReference Include="DBHelper-SqlSugar" Version="1.0.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 

WorkEngineering/Class1.cs

@@ -1,7 +0,0 @@
-namespace WorkEngineering
-{
-    public class Class1
-    {
-
-    }
-}

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs → WorkEngineering/Extensions/DeviceExtension.cs

@@ -1,10 +1,6 @@
 using DBHelper_SqlSugar;
 using Logs;
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
@@ -100,6 +96,129 @@ namespace WCS.Service.Extensions
             return source.WakeupOn(sec, "");
         }
 
+        public static IBCR80 BCR(this WCS_DEVICE source)
+        {
+            var dev = Device.Find("BCR" + source.CODE);
+            return dev.DEVICEPROTOCOLS.First().Data<IBCR80>();
+        }
+
+        public static short PalletType(this WCS_DEVICE source)
+        {
+            return (short)source.Get<int>("PalletType");
+        }
+
+        public static short ProductLine(this WCS_DEVICE source)
+        {
+            return (short)source.Get<int>("ProductLine");
+        }
+
+        public static short WorkShop(this WCS_DEVICE source)
+        {
+            return (short)source.Get<int>("WorkShop");
+        }
+
+        /// <summary>
+        /// 获取从source到endaddr的路径中的所有位置
+        /// </summary>
+        /// <param name="source">起始位置</param>
+        /// <param name="endAddr">目标位置</param>
+        /// <param name="condition">路径筛选条件</param>
+        /// <returns></returns>
+        public static List<WCS_DEVICE> GetPath(this WCS_DEVICE source, string endAddr, Func<List<WCS_DEVICE>, bool> condition = null)
+        {
+            var q = source.PATHS.Where(v => v.START == source & v.END.CODE.Contains(endAddr.ToUpper()))
+                .Select(v => v.PATH.Split('-').Select(v => Device.Find(v)).ToList());
+
+            if (condition != null)
+                q = q.Where(condition);
+
+            return q.FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 获取从source到endaddr的路径中的第一个位置
+        /// </summary>
+        /// <param name="source">起始位置</param>
+        /// <param name="endAddr">目标位置</param>
+        /// <param name="condition">路径筛选条件</param>
+        /// <returns></returns>
+        public static WCS_DEVICE GetPath(this WCS_DEVICE source, string endAddr)
+        {
+            var q = source.PATHS.Where(v => v.START == source && v.END.CODE.Contains(endAddr.ToUpper()))
+                .Select(v => v.PATH.Split('-').Select(v => Device.Find(v)).ToList());
+
+            return q.FirstOrDefault().FirstOrDefault();
+        }
+
+        public static WCS_DEVICE GetNext(this WCS_DEVICE source, string endAddr)
+        {
+            return source.GetNext(endAddr, null);
+        }
+
+        /// <summary>
+        /// 获取从source到endaddr的路径中的下一个位置
+        /// </summary>
+        /// <param name="source">起始位置</param>
+        /// <param name="endAddr">目标位置</param>
+        /// <param name="condition">路径筛选条件</param>
+        /// <returns></returns>
+        public static WCS_DEVICE GetNext(this WCS_DEVICE source, string endAddr, Func<List<WCS_DEVICE>, bool> condition)
+        {
+            var path = source.GetPath(endAddr, condition);
+            if (Ltc.Do(path, v => v == null || v.Count == 0))
+                return null;
+
+            if (source.IsConv())
+            {
+                var obj = path.FirstOrDefault(v => !v.IsConv());
+                if (obj == null)
+                {
+                    return path.Last();
+                }
+                else if (obj.IsRGV())
+                {
+                    var target = path.Skip(path.IndexOf(obj) + 1).FirstOrDefault();
+                    return target;
+                }
+                else
+                    return null;
+            }
+            else
+            {
+                return path.First();
+            }
+        }
+
+        public static bool IsDevGroup(this WCS_DEVICE source)
+        {
+            return source.CODE.Contains("G");
+        }
+
+        public static bool IsRGV(this WCS_DEVICE source)
+        {
+            return source.DEVICEPROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IRGV520).AssemblyQualifiedName);
+        }
+
+        public static bool IsConv(this WCS_DEVICE source)
+        {
+            return source.DEVICEPROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(IStation521).AssemblyQualifiedName);
+        }
+
+        /// <summary>
+        /// 是否堆垛机
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        public static bool IsSC(this WCS_DEVICE source)
+        {
+            return source.DEVICEPROTOCOLS.Any(v => v.DB.PROTOCOL == typeof(ISRM520).AssemblyQualifiedName);
+        }
+
+        public static bool IsTunnel(this WCS_DEVICE source)
+        {
+            return source.DEVICEPROTOCOLS.Count == 0 && source.CODE.StartsWith("T");
+        }
+
         public static void AddFlag(DF flag, params string[] devices)
         {
             var arr = LogicHandler.AllObjects.OfType<WCS_DEVICE>().Where(v => devices.Contains(v.CODE)).ToArray();

Projects/永冠OPP/WCS.Service/Helpers/FinishTaskList.cs → WorkEngineering/Helpers/FinishTaskList.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using WCS.Service.Entity;
+using WCS.Service.Entity;
 using WCS.Service.Extensions;
 
 namespace WCS.Service.Helpers

WorkEngineering/WorkEngineering.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -6,4 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
+    <PackageReference Include="WCS.Core" Version="1.0.2" />
+    <PackageReference Include="WCS.Entity.Protocol" Version="1.0.1" />
+  </ItemGroup>
+
 </Project>