From f27f28d4427d030fbac04e1d06acf1b2b8131f05 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 13:25:21 +0800
Subject: [PATCH] 添加wcs项目
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs | 190 ++++++++++++++++++++++++++++-------------------
1 files changed, 112 insertions(+), 78 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs
index 00858a4..91a608e 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs
@@ -4,47 +4,81 @@
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
+
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
-/// Wms浠诲姟绠＄悊琛ㄦ暟鎹弬鏁板璞�
+/// Wms浠诲姟绠＄悊鏁版嵁鍙傛暟瀵硅薄
/// </summary>
public class WmsTaskDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
{
/// <summary>
- /// 宸烽亾
+ /// 浠诲姟鍙�
/// </summary>
- public int? Aisle { get; set; }
+ public string TaskNo { get; set; }
/// <summary>
- ///
+ /// 浠诲姟绫诲瀷
/// </summary>
- public string? ConcurrencyStamp { get; set; }
+ public TaskTypeEnum TaskType { get; set; }
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public string TaskTypeDesc
+ {
+ get
+ {
+ if (TaskType == 0) return "";
+ return GetEnumDescriptionUtil.GetEnumDescription(TaskType);
+ }
+ }
+ /// <summary>
+ /// 浠诲姟绛夌骇
+ /// </summary>
+ public int TaskLevel { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鐘舵��
+ /// </summary>
+ public WmsTaskStatus TaskStatus { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鐘舵��
+ /// </summary>
+ public string TaskStatusDesc
+ {
+ get
+ {
+ if (TaskStatus == 0) return "";
+ return GetEnumDescriptionUtil.GetEnumDescription(TaskStatus);
+ }
+ }
/// <summary>
/// 鎵樼洏缂栧彿
/// </summary>
public string? ContainerNo { get; set; }
/// <summary>
- ///
+ /// 璧峰搴撲綅
/// </summary>
- public DateTime CreationTime { get; set; }
+ public string? SourcePlace { get; set; }
/// <summary>
- ///
+ /// 鐩爣搴撲綅
/// </summary>
- public string? CreatorId { get; set; }
+ public string? ToPlace { get; set; }
+
/// <summary>
- ///
+ /// PLC浠诲姟鍙�
/// </summary>
- public string? DeleterId { get; set; }
+ public int PlcTaskId { get; set; }
/// <summary>
- ///
+ /// 宸烽亾
/// </summary>
- public DateTime? DeletionTime { get; set; }
+ public int? Aisle { get; set; }
/// <summary>
/// 鍫嗗灈鏈篒D
@@ -54,27 +88,36 @@
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
- public int Dodevicetype { get; set; }
+ public DodevicetypeEnum Dodevicetype { get; set; }
/// <summary>
- ///
+ /// 璁惧绫诲瀷Desc
/// </summary>
- public ExtraPropertyDictionary? ExtraProperties { get; set; }
+ public string DodevicetypeDesc
+ {
+ get
+ {
+ if (Dodevicetype == 0) return "";
+ return GetEnumDescriptionUtil.GetEnumDescription(Dodevicetype);
+ }
+ }
/// <summary>
- ///
+ /// 璁惧浠诲姟鐘舵��
/// </summary>
- public bool IsDeleted { get; set; }
+ public TaskDodeviceStatus TaskDodeviceStatus { get; set; }
/// <summary>
- /// 鏄惁绂佺敤
+ /// 璁惧绫诲瀷Desc
/// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
- /// </summary>
- public int? IsNextTask { get; set; }
+ public string TaskDodeviceStatusDesc
+ {
+ get
+ {
+ if (TaskDodeviceStatus == 0) return "";
+ return GetEnumDescriptionUtil.GetEnumDescription(TaskDodeviceStatus);
+ }
+ }
/// <summary>
/// WCS鏄惁鍙互璇诲彇
@@ -82,14 +125,30 @@
public bool IsRead { get; set; }
/// <summary>
- ///
+ /// 瀛愪换鍔＄被鍨�
/// </summary>
- public DateTime? LastModificationTime { get; set; }
+ public SonTaskTypeEnum? SonTaskType { get; set; }
/// <summary>
- ///
+ /// 瀛愪换鍔＄被鍨�
/// </summary>
- public string? LastModifierId { get; set; }
+ public string? SonTaskTypeDesc
+ {
+ get
+ {
+ if (SonTaskType == 0 || !SonTaskType.HasValue) return "";
+ return GetEnumDescriptionUtil.GetEnumDescription(SonTaskType);
+ }
+ }
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁鍙�
+ /// </summary>
+ public string? SourceOrderNo { get; set; }
+
+ /// <summary>
+ /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
+ /// </summary>
+ public int? IsNextTask { get; set; }
/// <summary>
/// 鍙彉鍙橀噺1
@@ -107,84 +166,59 @@
public string? MutableParam3 { get; set; }
/// <summary>
- /// 瀛愪换鍔＄被鍨�
- /// </summary>
- public SonTaskTypeEnum? SonTaskType { get; set; }
-
- /// <summary>
- /// 瀛愪换鍔＄被鍨�
- /// </summary>
- public string? SonTaskTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(SonTaskType);
- }
- }
- /// <summary>
/// 鎺掑簭
/// </summary>
public int Sort { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁鍙�
+ /// 鏄惁绂佺敤
/// </summary>
- public string? SourceOrderNo { get; set; }
+ public bool? IsDisabled { get; set; }
/// <summary>
- /// 璧峰搴撲綅
+ ///
/// </summary>
- public string? SourcePlace { get; set; }
+ public ExtraPropertyDictionary? ExtraProperties { get; set; }
/// <summary>
- /// 璁惧浠诲姟鐘舵��
+ ///
/// </summary>
- public int TaskDodeviceStatus { get; set; }
+ public string? ConcurrencyStamp { get; set; }
/// <summary>
- /// 浠诲姟绛夌骇
+ ///
/// </summary>
- public int TaskLevel { get; set; }
+ public DateTime CreationTime { get; set; }
/// <summary>
- /// 浠诲姟鍙�
+ ///
/// </summary>
- public string TaskNo { get; set; }
+ public string? CreatorId { get; set; }
/// <summary>
- /// 浠诲姟鐘舵��
+ ///
/// </summary>
- public WmsTaskStatus TaskStatus { get; set; }
+ public DateTime? LastModificationTime { get; set; }
/// <summary>
- /// 浠诲姟鐘舵��
+ ///
/// </summary>
- public string TaskStatusDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(TaskStatus);
- }
- }
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- public TaskTypeEnum TaskType { get; set; }
+ public string? LastModifierId { get; set; }
/// <summary>
- /// 浠诲姟绫诲瀷
+ ///
/// </summary>
- public string TaskTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(TaskType);
- }
- }
+ public bool IsDeleted { get; set; }
+
/// <summary>
- /// 鐩爣搴撲綅
+ ///
/// </summary>
- public string? ToPlace { get; set; }
+ public string? DeleterId { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime? DeletionTime { get; set; }
--
Gitblit v1.9.3