From 89c3e31ff116f80bb6e6e7c5ef50f32448cb54ea Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 16 5月 2025 10:40:51 +0800
Subject: [PATCH] 端口修改
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs | 225 +++++++++++++++++++++++++++++--------------------------
1 files changed, 118 insertions(+), 107 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
index a3950c7..6ed6df2 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
@@ -1,10 +1,11 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CmsQueryExtensions.Extension;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
-/// Wms浠诲姟绠$悊琛ㄦ煡璇㈠弬鏁�
+/// 浠诲姟绠$悊鏌ヨ鍙傛暟
/// </summary>
public class GetWmsTaskInput : ExtensiblePagedAndSortedResultRequestDto
{
@@ -44,14 +45,44 @@
#endregion
/// <summary>
- /// 宸烽亾
+ /// 浠诲姟鍙�
/// </summary>
- public int? Aisle { get; set; }
+ public string TaskNo { get; set; }
/// <summary>
- /// 宸烽亾-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum Aisle_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public TaskTypeEnum? TaskType { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum TaskType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 浠诲姟绛夌骇
+ /// </summary>
+ public int? TaskLevel { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绛夌骇-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum TaskLevel_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 浠诲姟鐘舵��
+ /// </summary>
+ public WmsTaskStatus? TaskStatus { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum TaskStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 鎵樼洏缂栧彿
@@ -64,40 +95,44 @@
public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
/// <summary>
- ///
+ /// 璧峰搴撲綅
/// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> CreationTime { get; set; }
+ public string SourcePlace { get; set; }
+ /// <summary>
+ /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+
+ /// <summary>
+ /// 鐩爣搴撲綅
+ /// </summary>
+ public string ToPlace { get; set; }
+
+ /// <summary>
+ /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
/// <summary>
///
/// </summary>
- public string CreatorId { get; set; }
+ public int? PlcTaskId { get; set; }
/// <summary>
/// -鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+ public SearchFilterModeEnum PlcTaskId_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- ///
+ /// 宸烽亾
/// </summary>
- public string DeleterId { get; set; }
+ public int? Aisle { get; set; }
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 宸烽亾-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> DeletionTime { get; set; }
-
+ public SearchFilterModeEnum Aisle_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 鍫嗗灈鏈篒D
@@ -112,7 +147,7 @@
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
- public int? Dodevicetype { get; set; }
+ public DodevicetypeEnum? Dodevicetype { get; set; }
/// <summary>
/// 璁惧绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
@@ -120,34 +155,14 @@
public SearchFilterModeEnum Dodevicetype_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- ///
+ /// 璁惧浠诲姟鐘舵��
/// </summary>
- public bool? IsDeleted { get; set; }
+ public TaskDodeviceStatus? TaskDodeviceStatus { get; set; }
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 璁惧浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
- /// </summary>
- public int? IsNextTask { get; set; }
-
- /// <summary>
- /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsNextTask_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ public SearchFilterModeEnum TaskDodeviceStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// WCS鏄惁鍙互璇诲彇
@@ -160,22 +175,34 @@
public SearchFilterModeEnum IsRead_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- ///
+ /// 瀛愪换鍔$被鍨�
/// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> LastModificationTime { get; set; }
-
+ public SonTaskTypeEnum? SonTaskType { get; set; }
/// <summary>
- ///
+ /// 瀛愪换鍔$被鍨�-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public string LastModifierId { get; set; }
+ public SearchFilterModeEnum SonTaskType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鏉ユ簮鍗曟嵁鍙�
/// </summary>
- public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+ public string SourceOrderNo { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁鍙�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum SourceOrderNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+
+ /// <summary>
+ /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
+ /// </summary>
+ public int? IsNextTask { get; set; }
+
+ /// <summary>
+ /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsNextTask_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 鍙彉鍙橀噺1
@@ -208,16 +235,6 @@
public SearchFilterModeEnum MutableParam3_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
/// <summary>
- /// 瀛愪换鍔$被鍨�
- /// </summary>
- public int? SonTaskType { get; set; }
-
- /// <summary>
- /// 瀛愪换鍔$被鍨�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum SonTaskType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
/// 鎺掑簭
/// </summary>
public int? Sort { get; set; }
@@ -228,84 +245,78 @@
public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- /// 鏉ユ簮鍗曟嵁鍙�
+ /// 鏄惁绂佺敤
/// </summary>
- public string SourceOrderNo { get; set; }
+ public bool? IsDisabled { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁鍙�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum SourceOrderNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+ public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- /// 璧峰搴撲綅
+ /// 鍒涘缓鏃堕棿
/// </summary>
- public string SourcePlace { get; set; }
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public string CreationTime { get; set; }
+
/// <summary>
- /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
+ ///
/// </summary>
- public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+ public string CreatorId { get; set; }
/// <summary>
- /// 璁惧浠诲姟鐘舵��
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public int? TaskDodeviceStatus { get; set; }
+ public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
/// <summary>
- /// 璁惧浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
+ ///
/// </summary>
- public SearchFilterModeEnum TaskDodeviceStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public string LastModificationTime { get; set; }
+
/// <summary>
- /// 浠诲姟绛夌骇
+ ///
/// </summary>
- public int? TaskLevel { get; set; }
+ public string LastModifierId { get; set; }
/// <summary>
- /// 浠诲姟绛夌骇-鏌ヨ鍏崇郴杩愮畻绗�
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum TaskLevel_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
/// <summary>
- /// 浠诲姟鍙�
+ ///
/// </summary>
- public string TaskNo { get; set; }
+ public bool? IsDeleted { get; set; }
/// <summary>
- /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+ public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- /// 浠诲姟鐘舵��
+ ///
/// </summary>
- public int? TaskStatus { get; set; }
+ public string DeleterId { get; set; }
/// <summary>
- /// 浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum TaskStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
/// <summary>
- /// 浠诲姟绫诲瀷
+ ///
/// </summary>
- public int? TaskType { get; set; }
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public string DeletionTime { get; set; }
- /// <summary>
- /// 浠诲姟绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum TaskType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string ToPlace { get; set; }
-
- /// <summary>
- /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
}
--
Gitblit v1.9.3