From 251ac55b56c0ac330229cc217332e8d92381a69a Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 11:45:23 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs |  267 ++++++++++++++++++++++++++--------------------------
 1 files changed, 134 insertions(+), 133 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..8d2fe5b 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,152 +4,38 @@
 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? ContainerNo { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime CreationTime { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? CreatorId { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? DeleterId { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? DeletionTime { get; set; }
-
-    /// <summary>
-    /// 鍫嗗灈鏈篒D
-    /// </summary>
-    public int? DodeviceId { get; set; }
-
-    /// <summary>
-    /// 璁惧绫诲瀷
-    /// </summary>
-    public int Dodevicetype { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public ExtraPropertyDictionary? ExtraProperties { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool IsDeleted { get; set; }
-
-    /// <summary>
-    /// 鏄惁绂佺敤
-    /// </summary>
-    public bool? IsDisabled { get; set; }
-
-    /// <summary>
-    /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
-    /// </summary>
-    public int? IsNextTask { get; set; }
-
-    /// <summary>
-    /// WCS鏄惁鍙互璇诲彇
-    /// </summary>
-    public bool IsRead { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? LastModificationTime { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? LastModifierId { get; set; }
-
-    /// <summary>
-    /// 鍙彉鍙橀噺1
-    /// </summary>
-    public string? MutableParam1 { get; set; }
-
-    /// <summary>
-    /// 鍙彉鍙橀噺2
-    /// </summary>
-    public string? MutableParam2 { get; set; }
-
-    /// <summary>
-    /// 鍙彉鍙橀噺3
-    /// </summary>
-    public string? MutableParam3 { get; set; }
-
-    /// <summary>
-    /// 瀛愪换鍔＄被鍨�
-    /// </summary>
-    public SonTaskTypeEnum? SonTaskType { get; set; }
-
-    /// <summary>
-    /// 瀛愪换鍔＄被鍨�
-    /// </summary>
-    public string? SonTaskTypeDesc
+    public string TaskTypeDesc
     {
         get
         {
-            return GetEnumDescriptionUtil.GetEnumDescription(SonTaskType);
+            return GetEnumDescriptionUtil.GetEnumDescription(TaskType);
         }
     }
-    /// <summary>
-    /// 鎺掑簭
-    /// </summary>
-    public int Sort { get; set; }
-
-    /// <summary>
-    /// 鏉ユ簮鍗曟嵁鍙�
-    /// </summary>
-    public string? SourceOrderNo { get; set; }
-
-    /// <summary>
-    /// 璧峰搴撲綅
-    /// </summary>
-    public string? SourcePlace { get; set; }
-
-    /// <summary>
-    /// 璁惧浠诲姟鐘舵��
-    /// </summary>
-    public int TaskDodeviceStatus { get; set; }
-
     /// <summary>
     /// 浠诲姟绛夌骇
     /// </summary>
     public int TaskLevel { get; set; }
-
-    /// <summary>
-    /// 浠诲姟鍙�
-    /// </summary>
-    public string TaskNo { get; set; }
 
     /// <summary>
     /// 浠诲姟鐘舵��
@@ -167,25 +53,140 @@
         }
     }
     /// <summary>
-    /// 浠诲姟绫诲瀷
+    /// 鎵樼洏缂栧彿
     /// </summary>
-    public TaskTypeEnum TaskType { get; set; }
+    public string? ContainerNo { get; set; }
 
     /// <summary>
-    /// 浠诲姟绫诲瀷
+    /// 璧峰搴撲綅
     /// </summary>
-    public string TaskTypeDesc
-    {
-        get
-        {
-            return GetEnumDescriptionUtil.GetEnumDescription(TaskType);
-        }
-    }
+    public string? SourcePlace { get; set; }
+
     /// <summary>
     /// 鐩爣搴撲綅
     /// </summary>
     public string? ToPlace { get; set; }
 
+    /// <summary>
+    /// 宸烽亾
+    /// </summary>
+    public int? Aisle { get; set; }
+
+    /// <summary>
+    /// 鍫嗗灈鏈篒D
+    /// </summary>
+    public int? DodeviceId { get; set; }
+
+    /// <summary>
+    /// 璁惧绫诲瀷
+    /// </summary>
+    public int Dodevicetype { get; set; }
+
+    /// <summary>
+    /// 璁惧浠诲姟鐘舵��
+    /// </summary>
+    public int TaskDodeviceStatus { get; set; }
+
+    /// <summary>
+    /// WCS鏄惁鍙互璇诲彇
+    /// </summary>
+    public bool IsRead { get; set; }
+
+    /// <summary>
+    /// 瀛愪换鍔＄被鍨�
+    /// </summary>
+    public SonTaskTypeEnum? SonTaskType { get; set; }
+
+    /// <summary>
+    /// 瀛愪换鍔＄被鍨�
+    /// </summary>
+    public string? SonTaskTypeDesc
+    {
+        get
+        {
+            return GetEnumDescriptionUtil.GetEnumDescription(SonTaskType);
+        }
+    }
+    /// <summary>
+    /// 鏉ユ簮鍗曟嵁鍙�
+    /// </summary>
+    public string? SourceOrderNo { get; set; }
+
+    /// <summary>
+    /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
+    /// </summary>
+    public int? IsNextTask { get; set; }
+
+    /// <summary>
+    /// 鍙彉鍙橀噺1
+    /// </summary>
+    public string? MutableParam1 { get; set; }
+
+    /// <summary>
+    /// 鍙彉鍙橀噺2
+    /// </summary>
+    public string? MutableParam2 { get; set; }
+
+    /// <summary>
+    /// 鍙彉鍙橀噺3
+    /// </summary>
+    public string? MutableParam3 { get; set; }
+
+    /// <summary>
+    /// 鎺掑簭
+    /// </summary>
+    public int Sort { get; set; }
+
+    /// <summary>
+    /// 鏄惁绂佺敤
+    /// </summary>
+    public bool? IsDisabled { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ExtraPropertyDictionary? ExtraProperties { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? ConcurrencyStamp { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? CreatorId { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? LastModificationTime { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? LastModifierId { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool IsDeleted { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? DeleterId { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? DeletionTime { get; set; }
+
 
 
     /// <summary> 

--
Gitblit v1.9.3