From 743c2748dd4e3c2c2a84c7ae930a9cf287453a84 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周一, 12 5月 2025 17:10:40 +0800 Subject: [PATCH] 出入库 --- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs | 217 +++++++++++++++++++++++++++-------------------------- 1 files changed, 111 insertions(+), 106 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..973d40a 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 @@ -4,7 +4,7 @@ namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask; /// <summary> -/// Wms浠诲姟绠$悊琛ㄦ煡璇㈠弬鏁� +/// Wms浠诲姟绠$悊鏌ヨ鍙傛暟 /// </summary> public class GetWmsTaskInput : ExtensiblePagedAndSortedResultRequestDto { @@ -44,14 +44,49 @@ #endregion /// <summary> - /// 宸烽亾 + /// 浠诲姟鍙� /// </summary> - public int? Aisle { get; set; } + public string TaskNo { get; set; } + + /// <summary> + /// PLC浠诲姟鍙� + /// </summary> + public int PlcTaskId { get; set; } + + /// <summary> + /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> - /// 宸烽亾-鏌ヨ鍏崇郴杩愮畻绗� + /// 浠诲姟绫诲瀷 /// </summary> - public SearchFilterModeEnum Aisle_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; + public int? 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 int? TaskStatus { get; set; } + + /// <summary> + /// 浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum TaskStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; /// <summary> /// 鎵樼洏缂栧彿 @@ -64,40 +99,34 @@ public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> - /// + /// 璧峰搴撲綅 /// </summary> - //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� - [HighSearchRangeAttribute] - public List<string> CreationTime { get; set; } - + public string SourcePlace { get; set; } /// <summary> - /// + /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> - public string CreatorId { get; set; } + public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> - /// -鏌ヨ鍏崇郴杩愮畻绗� + /// 鐩爣搴撲綅 /// </summary> - public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + public string ToPlace { get; set; } /// <summary> - /// + /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> - public string DeleterId { get; set; } + public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> - /// -鏌ヨ鍏崇郴杩愮畻绗� + /// 宸烽亾 /// </summary> - public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + public int? Aisle { get; set; } /// <summary> - /// + /// 宸烽亾-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> - //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� - [HighSearchRangeAttribute] - public List<string> DeletionTime { get; set; } - + public SearchFilterModeEnum Aisle_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; /// <summary> /// 鍫嗗灈鏈篒D @@ -120,34 +149,14 @@ public SearchFilterModeEnum Dodevicetype_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; /// <summary> - /// + /// 璁惧浠诲姟鐘舵�� /// </summary> - public bool? IsDeleted { get; set; } + public int? 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 +169,34 @@ public SearchFilterModeEnum IsRead_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; /// <summary> - /// + /// 瀛愪换鍔$被鍨� /// </summary> - //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� - [HighSearchRangeAttribute] - public List<string> LastModificationTime { get; set; } - + public int? 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 +229,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 +239,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 List<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 List<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 List<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