From 33e4a9e82805b5976fdc379260b9b062dc653d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Thu, 8 Aug 2024 13:33:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Dto/taskType}/StaticTaskType.cs | 63 ++++++++++++++++---
src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs | 3 +-
src/Khd.Core.Wcs/Wcs/FirstFloor.cs | 1 +
src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs | 1 +
src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs | 1 +
src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs | 1 +
src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs | 1 +
src/Khd.Core.Wcs/Wcs/FourthFloorPoint.cs | 1 +
src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs | 1 +
src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs | 1 +
src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs | 2 +
src/Khd.Core.Wcs/Wcs/SystemTimer.cs | 1 +
src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs | 1 +
src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs | 1 +
14 files changed, 70 insertions(+), 9 deletions(-)
rename src/{Khd.Core.Wcs/Global => Khd.Core.Domain/Dto/taskType}/StaticTaskType.cs (58%)
diff --git a/src/Khd.Core.Wcs/Global/StaticTaskType.cs b/src/Khd.Core.Domain/Dto/taskType/StaticTaskType.cs
similarity index 58%
rename from src/Khd.Core.Wcs/Global/StaticTaskType.cs
rename to src/Khd.Core.Domain/Dto/taskType/StaticTaskType.cs
index 7384ea4..70fceea 100644
--- a/src/Khd.Core.Wcs/Global/StaticTaskType.cs
+++ b/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
+ ///
+ /// 任务类型
+ ///
+ public static class StaticTaskType
{
+ ///
+ /// 五楼辅料配送到工位
+ ///
+ public const int FiveBearAgv = 32;
+ ///
+ /// 五楼辅料退库
+ ///
+ public const int FiveAccessoryReturn = 48;
///
/// 二楼输送线到小包入口
///
@@ -124,5 +129,47 @@ namespace Khd.Core.Wcs.Global
/// 五楼辅料移库
///
public const int FiveAccessoryRemove = 102;
+
+ ///
+ /// 获取任务名称
+ ///
+ 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 => "五楼辅料移库",
+ _ => "未知任务类型",
+ };
+ }
}
}
diff --git a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
index c9db9ae..140c7bd 100644
--- a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
+++ b/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;
diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index 9e75a44..c851d0e 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
index b06bea3..b2fe13d 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs
index edcf08e..ed007bb 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
index 82a4e02..a94709f 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
index 09f852b..77c8e02 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/FourthFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/FourthFloorPoint.cs
index ef560e5..b1c4703 100644
--- a/src/Khd.Core.Wcs/Wcs/FourthFloorPoint.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs
index 1d2f278..2197309 100644
--- a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs
+++ b/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
diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs
index 57b17cc..f233da1 100644
--- a/src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
index 6e2a317..8111e8c 100644
--- a/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
+++ b/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
{
///
diff --git a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
index 7e059b5..54b65b8 100644
--- a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
index a054962..34e564b 100644
--- a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs
index ecbbe53..82ba5d7 100644
--- a/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs
+++ b/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
{