Merge branch 'master' of https://gitee.com/ericxinstar/jywcs

src/Khd.Core.Domain/Dto/taskType/StaticTaskType.cs

@@ -1,13 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Khd.Core.Wcs.Global
+namespace Khd.Core.Domain.Dto.TaskType
 {
-    public class StaticTaskType
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    public static class StaticTaskType
     {
+        /// <summary>
+        /// 五楼辅料配送到工位
+        /// </summary>
+        public const int FiveBearAgv = 32;
+        /// <summary>
+        /// 五楼辅料退库
+        /// </summary>
+        public const int FiveAccessoryReturn = 48;
         /// <summary>
         /// 二楼输送线到小包入口
         /// </summary>
@@ -124,5 +129,47 @@ namespace Khd.Core.Wcs.Global
         /// 五楼辅料移库
         /// </summary>
         public const int FiveAccessoryRemove = 102;
+
+        /// <summary>
+        /// 获取任务名称
+        /// </summary>
+        public static string GetTaskName(int taskType)
+        {
+            return taskType switch
+            {
+                FiveBearAgv => "五楼辅料配送到工位",
+                FiveAccessoryReturn => "五楼辅料退库",
+                SecondLineToSmallPackage => "二楼输送线到小包入口",
+                SecondWasteToTransit => "二楼废料工位到周转位",
+                SecondSmallPackageToStorage => "二楼小包出口到库位",
+                SecondTransitToLift => "二楼周转位到提升机",
+                SecondStorageToLift => "二楼库位到提升机",
+                SecondRemove => "二楼移库",
+                SecondLiftToWaste => "二楼提升机到废料工位",
+                SecondTransitToWaste => "二楼周转位到废料工位",
+                SecondLiftToTransit => "二楼提升机到周转位",
+                SecondTransitToSmallPackage => "二楼周转位到小包入口",
+                ThirdRemove => "三楼移库",
+                ThirdRawIn => "三楼原材料入库",
+                ThirdRawToFlip => "三楼原材料到翻转机",
+                ThirdTransitToBin => "三楼周转区到托盘收集架",
+                ThirdFlipToBin => "三楼翻转机到托盘收集架",
+                ThirdBinToTransit => "三楼托盘收集架到周转区",
+                ThirdTransitToLift => "三楼周转区到提升机",
+                FiveRawIn => "五楼原材料入库",
+                FiveRawToSplit => "五楼原材料到拆分",
+                FiveRawSplitReturn => "五楼原材料拆分返库",
+                FiveRemove => "五楼移库",
+                FiveRawToBack => "五楼原材料到背板安装",
+                FiveHalfIn => "五楼半成品入库",
+                FiveProductOut => "五楼成品出库库",
+                FiveAccessoryIn => "五楼辅料入库",
+                FiveAccessoryOut => "五楼辅料出库",
+                FiveAccessoryStorage => "五楼辅料盘库",
+                ThirdTransitToSecond => "三楼接驳位转运空托盘到二楼",
+                FiveAccessoryRemove => "五楼辅料移库",
+                _ => "未知任务类型",
+            };
+        }
     }
 }

src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs

@@ -1,4 +1,5 @@
-using Khd.Core.Domain.Models;
+using Khd.Core.Domain.Dto.TaskType;
+using Khd.Core.Domain.Models;
 using Khd.Core.EntityFramework;
 using Khd.Core.Library;
 using Khd.Core.Library.Mapper;

src/Khd.Core.Wcs/Wcs/FirstFloor.cs

@@ -8,6 +8,7 @@ using Masuit.Tools;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Z.EntityFramework.Plus;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs

@@ -10,6 +10,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
 using Z.EntityFramework.Plus;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
 using Z.EntityFramework.Plus;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs

@@ -10,6 +10,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
 using Z.EntityFramework.Plus;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs

@@ -8,6 +8,7 @@ using Masuit.Tools;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Z.EntityFramework.Plus;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/FourthFloorPoint.cs

@@ -7,6 +7,7 @@ using Khd.Core.Wcs.Global;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Z.EntityFramework.Plus;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs

@@ -8,6 +8,7 @@ using Masuit.Tools;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
+using Khd.Core.Domain.Dto.TaskType;
 using Z.EntityFramework.Plus;
 
 namespace Khd.Core.Wcs.Wcs

src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs

@@ -7,6 +7,7 @@ using Khd.Core.Wcs.Global;
 using Masuit.Tools;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs

@@ -6,6 +6,8 @@ using Khd.Core.Plc.S7;
 using Khd.Core.Wcs.Global;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Khd.Core.Domain.Dto.TaskType;
+
 namespace Khd.Core.Wcs.Wcs
 {
     /// <summary>

src/Khd.Core.Wcs/Wcs/SystemTimer.cs

@@ -8,6 +8,7 @@ using Masuit.Tools;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs

@@ -10,6 +10,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
 using Z.EntityFramework.Plus;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {

src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs

@@ -8,6 +8,7 @@ using Masuit.Tools;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Z.EntityFramework.Plus;
+using Khd.Core.Domain.Dto.TaskType;
 
 namespace Khd.Core.Wcs.Wcs
 {