Преглед на файлове

叫料出库任务数量wms配置

Administrator преди 3 години
родител
ревизия
dd2b5a5f54
променени са 4 файла, в които са добавени 102 реда и са изтрити 1 реда
  1. BIN
      DLL/PLC.Siemens.dll
  2. 16 0
      Projects/永冠OPP/WCS.Service/Handlers/SCHandler.cs
  3. 4 1
      Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs
  4. 82 0
      WCS.sln

BIN
DLL/PLC.Siemens.dll


+ 16 - 0
Projects/永冠OPP/WCS.Service/Handlers/SCHandler.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WCS.Core;
+
+namespace WCS.Service.Handlers
+{
+    [Description("堆垛机")]
+    class SCHandler : WorkHandler
+    {
+        public override bool ParallelRun =>true;
+    }
+}

+ 4 - 1
Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

@@ -428,7 +428,10 @@ namespace WCS.Service.Works.Station
                              if (stationDeviceGroup.Entity.CODE != "G1340") continue;
                              var qty = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.叫料 && v.Status > AGVTaskStatus.新建 && v.Status < AGVTaskStatus.完成).Count(v => v.Position == tasking.Position);
 
-                             if (qty >= 4)
+                             var cmQty = ProtocolProxy.YGWMS150Redis.Get("MaxLineCallTaskCount").ToInt();
+                           
+
+                             if (qty >= cmQty)
                              {
                                  InfoLog.INFO_WarnDb($"{tasking.Position}正在执行的叫料任务数量已达{qty},暂停出库", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常);
                                  continue;

+ 82 - 0
WCS.sln

@@ -0,0 +1,82 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Core", "WCS.Core\WCS.Core.csproj", "{609C1A57-7CFF-4BC1-B0C6-DA679C530D43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "项目", "项目", "{B500324F-34BF-4A32-ACDF-F1D4F3DE0889}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "框架", "框架", "{2C6BCFE4-581D-4BC8-91EC-BD9FA91B9605}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DBHelper", "DBHelper\DBHelper.csproj", "{6658427B-CB28-4F30-94D7-54541EB7D7FC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCS.DebugTool", "WCS.DebugTool\WCS.DebugTool.csproj", "{6E83138E-F92B-40FB-BEB4-F5E02383B823}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLC.Siemens", "PLC.Siemens\PLC.Siemens.csproj", "{8F6C4A79-98EA-4019-B72A-29290328185A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Entity", "WCS.Entity\WCS.Entity.csproj", "{15418D7B-CA4F-4FE3-8179-E7D84FF9C167}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Entity.Protocol", "Projects\永冠OPP\WCS.Entity.Protocol\WCS.Entity.Protocol.csproj", "{B5BA1EC4-EAA5-4003-B687-3159FB02E636}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "永冠OPP", "永冠OPP", "{37B86E98-86D4-41C0-A380-F56DD9431EFF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2D7E1E25-DEA4-4F74-9042-D3C41FA29999}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Service", "Projects\永冠OPP\WCS.Service\WCS.Service.csproj", "{0C1638C8-68C1-4493-A731-186E58CEC4F0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{609C1A57-7CFF-4BC1-B0C6-DA679C530D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{609C1A57-7CFF-4BC1-B0C6-DA679C530D43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{609C1A57-7CFF-4BC1-B0C6-DA679C530D43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{609C1A57-7CFF-4BC1-B0C6-DA679C530D43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6658427B-CB28-4F30-94D7-54541EB7D7FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6658427B-CB28-4F30-94D7-54541EB7D7FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6658427B-CB28-4F30-94D7-54541EB7D7FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6658427B-CB28-4F30-94D7-54541EB7D7FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E83138E-F92B-40FB-BEB4-F5E02383B823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E83138E-F92B-40FB-BEB4-F5E02383B823}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E83138E-F92B-40FB-BEB4-F5E02383B823}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E83138E-F92B-40FB-BEB4-F5E02383B823}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F6C4A79-98EA-4019-B72A-29290328185A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F6C4A79-98EA-4019-B72A-29290328185A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F6C4A79-98EA-4019-B72A-29290328185A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F6C4A79-98EA-4019-B72A-29290328185A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15418D7B-CA4F-4FE3-8179-E7D84FF9C167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15418D7B-CA4F-4FE3-8179-E7D84FF9C167}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15418D7B-CA4F-4FE3-8179-E7D84FF9C167}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15418D7B-CA4F-4FE3-8179-E7D84FF9C167}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5BA1EC4-EAA5-4003-B687-3159FB02E636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5BA1EC4-EAA5-4003-B687-3159FB02E636}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5BA1EC4-EAA5-4003-B687-3159FB02E636}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5BA1EC4-EAA5-4003-B687-3159FB02E636}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C1638C8-68C1-4493-A731-186E58CEC4F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C1638C8-68C1-4493-A731-186E58CEC4F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C1638C8-68C1-4493-A731-186E58CEC4F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C1638C8-68C1-4493-A731-186E58CEC4F0}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{609C1A57-7CFF-4BC1-B0C6-DA679C530D43} = {2C6BCFE4-581D-4BC8-91EC-BD9FA91B9605}
+		{6658427B-CB28-4F30-94D7-54541EB7D7FC} = {2C6BCFE4-581D-4BC8-91EC-BD9FA91B9605}
+		{6E83138E-F92B-40FB-BEB4-F5E02383B823} = {2C6BCFE4-581D-4BC8-91EC-BD9FA91B9605}
+		{8F6C4A79-98EA-4019-B72A-29290328185A} = {2C6BCFE4-581D-4BC8-91EC-BD9FA91B9605}
+		{15418D7B-CA4F-4FE3-8179-E7D84FF9C167} = {2C6BCFE4-581D-4BC8-91EC-BD9FA91B9605}
+		{B5BA1EC4-EAA5-4003-B687-3159FB02E636} = {37B86E98-86D4-41C0-A380-F56DD9431EFF}
+		{37B86E98-86D4-41C0-A380-F56DD9431EFF} = {B500324F-34BF-4A32-ACDF-F1D4F3DE0889}
+		{0C1638C8-68C1-4493-A731-186E58CEC4F0} = {37B86E98-86D4-41C0-A380-F56DD9431EFF}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {75D30B04-ADD6-4FC6-8D7E-FAD45B731BB4}
+	EndGlobalSection
+EndGlobal