高级查询

zs

2025-05-07 fbd434b2aaf5e1f7035f3843508c62ea930d2549

高级查询

 CommonDLL/CmsQueryExtensions.dll

Binary files differ

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs

@@ -108,7 +108,7 @@
    /// </summary>
    //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
    [HighSearchRangeAttribute]
    public List<string> OperateTime { get; set; }
    public string OperateTime { get; set; }


    /// <summary>

 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,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 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 +94,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>
        /// å †åž›æœºID
@@ -120,34 +144,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 +164,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 +224,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 +234,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.模糊查询;

 
} 

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateDto.cs

@@ -1,7 +1,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask; 
 
/// <summary> 
/// Wms任务管理表创建参数对象 
/// Wms任务管理创建参数对象 
/// </summary> 
public class WmsTaskCreateDto : WmsTaskCreateOrUpdateDtoBase 
{ 

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs

@@ -5,14 +5,29 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask; 
 
/// <summary> 
/// Wms任务管理表创建或更新基类 
/// Wms任务管理创建或更新基类 
/// </summary> 
public abstract class WmsTaskCreateOrUpdateDtoBase : ExtensibleEntityDto 
{ 
            /// <summary>
        /// å··é“
        /// ä»»åŠ¡å·
        /// </summary>
        public int? Aisle { get; set; }
        public string TaskNo { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        public TaskTypeEnum TaskType { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç­‰çº§
        /// </summary>
        public int TaskLevel { get; set; }

        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        public WmsTaskStatus TaskStatus { get; set; }

        /// <summary>
        /// æ‰˜ç›˜ç¼–号
@@ -20,9 +35,19 @@
        public string? ContainerNo { get; set; }

        /// <summary>
        /// 
        /// èµ·å§‹åº“位
        /// </summary>
        public string? CreatorId { get; set; }
        public string? SourcePlace { get; set; }

        /// <summary>
        /// ç›®æ ‡åº“位
        /// </summary>
        public string? ToPlace { get; set; }

        /// <summary>
        /// å··é“
        /// </summary>
        public int? Aisle { get; set; }

        /// <summary>
        /// å †åž›æœºID
@@ -35,14 +60,9 @@
        public int Dodevicetype { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// è®¾å¤‡ä»»åŠ¡çŠ¶æ€
        /// </summary>
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// ä¸‹ä¸ªä»»åŠ¡æ˜¯å¦ç”ŸæˆæˆåŠŸ
        /// </summary>
        public int? IsNextTask { get; set; }
        public int TaskDodeviceStatus { get; set; }

        /// <summary>
        /// WCS是否可以读取
@@ -50,9 +70,19 @@
        public bool IsRead { get; set; }

        /// <summary>
        /// 
        /// å­ä»»åŠ¡ç±»åž‹
        /// </summary>
        public string? LastModifierId { get; set; }
        public SonTaskTypeEnum? SonTaskType { get; set; }

        /// <summary>
        /// æ¥æºå•æ®å·
        /// </summary>
        public string? SourceOrderNo { get; set; }

        /// <summary>
        /// ä¸‹ä¸ªä»»åŠ¡æ˜¯å¦ç”ŸæˆæˆåŠŸ
        /// </summary>
        public int? IsNextTask { get; set; }

        /// <summary>
        /// å¯å˜å˜é‡1
@@ -70,54 +100,24 @@
        public string? MutableParam3 { get; set; }

        /// <summary>
        /// å­ä»»åŠ¡ç±»åž‹
        /// </summary>
        public SonTaskTypeEnum? SonTaskType { get; set; }

        /// <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 string? CreatorId { get; set; }

        /// <summary>
        /// è®¾å¤‡ä»»åŠ¡çŠ¶æ€
        /// 
        /// </summary>
        public int TaskDodeviceStatus { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç­‰çº§
        /// </summary>
        public int TaskLevel { get; set; }

        /// <summary>
        /// ä»»åŠ¡å·
        /// </summary>
        public string TaskNo { get; set; }

        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        public WmsTaskStatus TaskStatus { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        public TaskTypeEnum TaskType { get; set; }

        /// <summary>
        /// ç›®æ ‡åº“位
        /// </summary>
        public string? ToPlace { get; set; }
        public string? LastModifierId { get; set; }

 
 

 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>
    /// å †åž›æœºID
    /// </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>
    /// å †åž›æœºID
    /// </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> 

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs

@@ -6,21 +6,57 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask; 
 
/// <summary> 
/// Wms任务管理表导出模型 
/// Wms任务管理导出模型 
/// </summary> 
public  class WmsTaskExportModel 
{ 
            /// <summary>
        /// å··é“
        /// ä»»åŠ¡å·
        /// </summary>
        [ExcelColumn(Name = "巷道", Width = 25)]
        public int? Aisle { get; set; }
        [ExcelColumn(Name = "任务号", Width = 25)]
        public string TaskNo { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        [ExcelColumn(Name = "任务类型", Width = 25)]
        public TaskTypeEnum TaskType { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç­‰çº§
        /// </summary>
        [ExcelColumn(Name = "任务等级", Width = 25)]
        public int TaskLevel { get; set; }

        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        [ExcelColumn(Name = "任务状态", Width = 25)]
        public WmsTaskStatus TaskStatus { get; set; }

        /// <summary>
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        [ExcelColumn(Name = "托盘编号", Width = 25)]
        public string ContainerNo { get; set; }

        /// <summary>
        /// èµ·å§‹åº“位
        /// </summary>
        [ExcelColumn(Name = "起始库位", Width = 25)]
        public string SourcePlace { get; set; }

        /// <summary>
        /// ç›®æ ‡åº“位
        /// </summary>
        [ExcelColumn(Name = "目标库位", Width = 25)]
        public string ToPlace { get; set; }

        /// <summary>
        /// å··é“
        /// </summary>
        [ExcelColumn(Name = "巷道", Width = 25)]
        public int? Aisle { get; set; }

        /// <summary>
        /// å †åž›æœºID
@@ -35,22 +71,34 @@
        public int Dodevicetype { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// è®¾å¤‡ä»»åŠ¡çŠ¶æ€
        /// </summary>
        [ExcelColumn(Name = "是否禁用", Width = 25)]
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// ä¸‹ä¸ªä»»åŠ¡æ˜¯å¦ç”ŸæˆæˆåŠŸ
        /// </summary>
        [ExcelColumn(Name = "下个任务是否生成成功", Width = 25)]
        public int? IsNextTask { get; set; }
        [ExcelColumn(Name = "设备任务状态", Width = 25)]
        public int TaskDodeviceStatus { get; set; }

        /// <summary>
        /// WCS是否可以读取
        /// </summary>
        [ExcelColumn(Name = "WCS是否可以读取", Width = 25)]
        public bool IsRead { get; set; }

        /// <summary>
        /// å­ä»»åŠ¡ç±»åž‹
        /// </summary>
        [ExcelColumn(Name = "子任务类型", Width = 25)]
        public SonTaskTypeEnum? SonTaskType { get; set; }

        /// <summary>
        /// æ¥æºå•æ®å·
        /// </summary>
        [ExcelColumn(Name = "来源单据号", Width = 25)]
        public string SourceOrderNo { get; set; }

        /// <summary>
        /// ä¸‹ä¸ªä»»åŠ¡æ˜¯å¦ç”ŸæˆæˆåŠŸ
        /// </summary>
        [ExcelColumn(Name = "下个任务是否生成成功", Width = 25)]
        public int? IsNextTask { get; set; }

        /// <summary>
        /// å¯å˜å˜é‡1
@@ -71,64 +119,16 @@
        public string MutableParam3 { get; set; }

        /// <summary>
        /// å­ä»»åŠ¡ç±»åž‹
        /// </summary>
        [ExcelColumn(Name = "子任务类型", Width = 25)]
        public SonTaskTypeEnum? SonTaskType { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        [ExcelColumn(Name = "排序", Width = 25)]
        public int Sort { get; set; }

        /// <summary>
        /// æ¥æºå•æ®å·
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        [ExcelColumn(Name = "来源单据号", Width = 25)]
        public string SourceOrderNo { get; set; }

        /// <summary>
        /// èµ·å§‹åº“位
        /// </summary>
        [ExcelColumn(Name = "起始库位", Width = 25)]
        public string SourcePlace { get; set; }

        /// <summary>
        /// è®¾å¤‡ä»»åŠ¡çŠ¶æ€
        /// </summary>
        [ExcelColumn(Name = "设备任务状态", Width = 25)]
        public int TaskDodeviceStatus { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç­‰çº§
        /// </summary>
        [ExcelColumn(Name = "任务等级", Width = 25)]
        public int TaskLevel { get; set; }

        /// <summary>
        /// ä»»åŠ¡å·
        /// </summary>
        [ExcelColumn(Name = "任务号", Width = 25)]
        public string TaskNo { get; set; }

        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        [ExcelColumn(Name = "任务状态", Width = 25)]
        public WmsTaskStatus TaskStatus { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        [ExcelColumn(Name = "任务类型", Width = 25)]
        public TaskTypeEnum TaskType { get; set; }

        /// <summary>
        /// ç›®æ ‡åº“位
        /// </summary>
        [ExcelColumn(Name = "目标库位", Width = 25)]
        public string ToPlace { get; set; }
        [ExcelColumn(Name = "是否禁用", Width = 25)]
        public bool? IsDisabled { get; set; }

 
 

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskUpdateDto.cs

@@ -2,7 +2,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask; 
 
/// <summary> 
/// Wms任务管理表更新参数对象 
/// Wms任务管理更新参数对象 
/// </summary> 
public class WmsTaskUpdateDto : WmsTaskCreateOrUpdateDtoBase, IHasConcurrencyStamp 
{ 

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTasksImportModel.cs

@@ -2,7 +2,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask 
{ 
    /// <summary> 
    /// Wms任务管理表导入模型 
    /// Wms任务管理导入模型 
    /// </summary> 
    public class WmsTasksImportModel 
    { 
@@ -20,7 +20,7 @@
        } 
 
        /// <summary> 
        /// Wms任务管理表导入模型 
        /// Wms任务管理导入模型 
        /// </summary> 
        public class WmsTaskImportModel : WmsTaskExportModel 
        { 

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsTaskAppService.cs

@@ -4,26 +4,26 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Services; 
 
/// <summary> 
/// Wms任务管理表应用服务接口 
/// Wms任务管理应用服务接口 
/// </summary> 
public interface IWmsTaskAppService : ICrudAppService<WmsTaskDto, Guid, GetWmsTaskInput, WmsTaskCreateDto, WmsTaskUpdateDto> 
{ 
    /// <summary> 
    /// å…‹éš†Wms任务管理表 
    /// å…‹éš†Wms任务管理 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    Task<List<WmsTaskDto>> CloneAsync(IEnumerable<Guid> ids); 
 
    /// <summary> 
    /// åˆ é™¤Wms任务管理表 
    /// åˆ é™¤Wms任务管理 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    Task DeleteManyAsync(IEnumerable<Guid> ids); 
 
    /// <summary> 
    /// è°ƒæ•´æŽ’序Wms任务管理表 
    /// è°ƒæ•´æŽ’序Wms任务管理 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="sort"></param> 
@@ -31,14 +31,14 @@
    Task AdjustSortAsync(Guid id, int sort); 
 
    /// <summary> 
    /// å¯¼å…¥Wms任务管理表 
    /// å¯¼å…¥Wms任务管理 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    Task ImportAsync(WmsTasksImportModel input); 
 
    /// <summary> 
    /// å¯¼å‡ºWms任务管理表 
    /// å¯¼å‡ºWms任务管理 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsTaskAppService.cs

@@ -1,8 +1,8 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.WmsTask;
using CmsQueryExtensions;
using CMS.Plugin.HIAWms.Domain.WmsTask; 
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;
using Volo.Abp;
@@ -14,7 +14,7 @@
namespace CMS.Plugin.HIAWms.Application.Implements;

/// <summary> 
/// Wms任务管理表应用服务 
/// Wms任务管理应用服务 
/// </summary> 
public class WmsTaskAppService : CMSPluginAppService, IWmsTaskAppService
{
@@ -30,7 +30,7 @@
    }

    /// <summary> 
    /// èŽ·å–指定Wms任务管理表 
    /// èŽ·å–指定Wms任务管理 
    /// </summary> 
    /// <param name="id"></param> 
    /// <returns></returns> 
@@ -40,7 +40,7 @@
    }

    /// <summary> 
    /// åˆ†é¡µèŽ·å–Wms任务管理表 
    /// åˆ†é¡µèŽ·å–Wms任务管理 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
@@ -90,7 +90,7 @@
    }

    /// <summary> 
    /// æ–°å»ºWms任务管理表 
    /// æ–°å»ºWms任务管理 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
@@ -123,7 +123,7 @@
    }

    /// <summary> 
    /// æ›´æ–°Wms任务管理表 
    /// æ›´æ–°Wms任务管理 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="input"></param> 
@@ -143,25 +143,25 @@
        updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);

        updateObj.Aisle = input.Aisle;
                updateObj.TaskNo = input.TaskNo;
        updateObj.TaskType = input.TaskType;
        updateObj.TaskLevel = input.TaskLevel;
        updateObj.TaskStatus = input.TaskStatus;
        updateObj.ContainerNo = input.ContainerNo;
        updateObj.SourcePlace = input.SourcePlace;
        updateObj.ToPlace = input.ToPlace;
        updateObj.Aisle = input.Aisle;
        updateObj.DodeviceId = input.DodeviceId;
        updateObj.Dodevicetype = input.Dodevicetype;
        updateObj.IsDisabled = input.IsDisabled;
        updateObj.IsNextTask = input.IsNextTask;
        updateObj.TaskDodeviceStatus = input.TaskDodeviceStatus;
        updateObj.IsRead = input.IsRead;
        updateObj.SonTaskType = input.SonTaskType;
        updateObj.SourceOrderNo = input.SourceOrderNo;
        updateObj.IsNextTask = input.IsNextTask;
        updateObj.MutableParam1 = input.MutableParam1;
        updateObj.MutableParam2 = input.MutableParam2;
        updateObj.MutableParam3 = input.MutableParam3;
        updateObj.SonTaskType = input.SonTaskType;
        updateObj.SourceOrderNo = input.SourceOrderNo;
        updateObj.SourcePlace = input.SourcePlace;
        updateObj.TaskDodeviceStatus = input.TaskDodeviceStatus;
        updateObj.TaskLevel = input.TaskLevel;
        updateObj.TaskNo = input.TaskNo;
        updateObj.TaskStatus = input.TaskStatus;
        updateObj.TaskType = input.TaskType;
        updateObj.ToPlace = input.ToPlace;
        updateObj.IsDisabled = input.IsDisabled;


        await wmsTaskRepository.UpdateAsync(updateObj);
@@ -170,7 +170,7 @@
    }

    /// <summary> 
    /// å…‹éš†Wms任务管理表 
    /// å…‹éš†Wms任务管理 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
@@ -210,7 +210,7 @@
    }

    /// <summary> 
    /// åˆ é™¤å•ä¸ªWms任务管理表 
    /// åˆ é™¤å•ä¸ªWms任务管理 
    /// </summary> 
    /// <param name="id"></param> 
    /// <returns></returns> 
@@ -220,7 +220,7 @@
    }

    /// <summary> 
    /// åˆ é™¤å¤šä¸ªWms任务管理表 
    /// åˆ é™¤å¤šä¸ªWms任务管理 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
@@ -233,7 +233,7 @@
    }

    /// <summary> 
    /// è°ƒæ•´æŽ’序Wms任务管理表 
    /// è°ƒæ•´æŽ’序Wms任务管理 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="sort"></param> 
@@ -271,7 +271,7 @@
    }

    /// <summary> 
    /// å¯¼å…¥Wms任务管理表 
    /// å¯¼å…¥Wms任务管理 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
@@ -317,25 +317,25 @@
                {
                    var wmsTaskUpdateDto = new WmsTaskUpdateDto
                    {
                        Aisle = impItem.Aisle,
                        TaskNo = impItem.TaskNo,
TaskType = impItem.TaskType,
TaskLevel = impItem.TaskLevel,
TaskStatus = impItem.TaskStatus,
                        ContainerNo = impItem.ContainerNo,
SourcePlace = impItem.SourcePlace,
ToPlace = impItem.ToPlace,
Aisle = impItem.Aisle,
                        DodeviceId = impItem.DodeviceId,
                        Dodevicetype = impItem.Dodevicetype,
                        IsDisabled = impItem.IsDisabled,
                        IsNextTask = impItem.IsNextTask,
TaskDodeviceStatus = impItem.TaskDodeviceStatus,
                        IsRead = impItem.IsRead,
SonTaskType = impItem.SonTaskType,
SourceOrderNo = impItem.SourceOrderNo,
IsNextTask = impItem.IsNextTask,
                        MutableParam1 = impItem.MutableParam1,
                        MutableParam2 = impItem.MutableParam2,
                        MutableParam3 = impItem.MutableParam3,
                        SonTaskType = impItem.SonTaskType,
                        SourceOrderNo = impItem.SourceOrderNo,
                        SourcePlace = impItem.SourcePlace,
                        TaskDodeviceStatus = impItem.TaskDodeviceStatus,
                        TaskLevel = impItem.TaskLevel,
                        TaskNo = impItem.TaskNo,
                        TaskStatus = impItem.TaskStatus,
                        TaskType = impItem.TaskType,
                        ToPlace = impItem.ToPlace,
IsDisabled = impItem.IsDisabled,

                    };

@@ -345,25 +345,25 @@
                {
                    var wmsTaskCreateDto = new WmsTaskCreateDto
                    {
                        Aisle = impItem.Aisle,
                        TaskNo = impItem.TaskNo,
TaskType = impItem.TaskType,
TaskLevel = impItem.TaskLevel,
TaskStatus = impItem.TaskStatus,
                        ContainerNo = impItem.ContainerNo,
SourcePlace = impItem.SourcePlace,
ToPlace = impItem.ToPlace,
Aisle = impItem.Aisle,
                        DodeviceId = impItem.DodeviceId,
                        Dodevicetype = impItem.Dodevicetype,
                        IsDisabled = impItem.IsDisabled,
                        IsNextTask = impItem.IsNextTask,
TaskDodeviceStatus = impItem.TaskDodeviceStatus,
                        IsRead = impItem.IsRead,
SonTaskType = impItem.SonTaskType,
SourceOrderNo = impItem.SourceOrderNo,
IsNextTask = impItem.IsNextTask,
                        MutableParam1 = impItem.MutableParam1,
                        MutableParam2 = impItem.MutableParam2,
                        MutableParam3 = impItem.MutableParam3,
                        SonTaskType = impItem.SonTaskType,
                        SourceOrderNo = impItem.SourceOrderNo,
                        SourcePlace = impItem.SourcePlace,
                        TaskDodeviceStatus = impItem.TaskDodeviceStatus,
                        TaskLevel = impItem.TaskLevel,
                        TaskNo = impItem.TaskNo,
                        TaskStatus = impItem.TaskStatus,
                        TaskType = impItem.TaskType,
                        ToPlace = impItem.ToPlace,
IsDisabled = impItem.IsDisabled,

                    };

@@ -402,7 +402,7 @@
    }

    /// <summary> 
    /// å¯¼å‡ºWms任务管理表 
    /// å¯¼å‡ºWms任务管理 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
@@ -431,25 +431,25 @@
            ["配置"] = ExportHelper.ConvertListToExportData(result),
        };

        var fileName = result.Count > 1 ? "Wms任务管理表列表" : result.Count == 1 ? result[0]?.TaskNo : "WmsTask模版";
        var fileName = result.Count > 1 ? "Wms任务管理列表" : result.Count == 1 ? result[0]?.TaskNo : "WmsTask模版"; 
        return (sheets, fileName);
    }

    /// <summary> 
    /// æ ¡éªŒWms任务管理表，当新建或更新时 
    /// æ ¡éªŒWms任务管理，当新建或更新时 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    protected Task CheckCreateOrUpdateDtoAsync(WmsTaskCreateOrUpdateDtoBase input)
    {
        Check.NotNull(input, nameof(input));
        Check.NotNull(input.Dodevicetype, "设备类型");
        Check.NotNull(input.IsRead, "WCS是否可以读取");
        Check.NotNull(input.TaskDodeviceStatus, "设备任务状态");
        Check.NotNull(input.TaskLevel, "任务等级");
        Check.NotNullOrWhiteSpace(input.TaskNo, "任务号", 50);
        Check.NotNull(input.TaskStatus, "任务状态");
        Check.NotNull(input.TaskType, "任务类型");
        Check.NotNull(input.TaskLevel, "任务等级");
        Check.NotNull(input.TaskStatus, "任务状态");
        Check.NotNull(input.Dodevicetype, "设备类型");
        Check.NotNull(input.TaskDodeviceStatus, "设备任务状态");
        Check.NotNull(input.IsRead, "WCS是否可以读取");

        return Task.CompletedTask;
    }

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsTaskAutoMapperProfile.cs

@@ -6,7 +6,7 @@
namespace CMS.Plugin.HIAWms.Application.MapperProfiles; 
 
/// <summary> 
/// Wms任务管理表AutoMapper配置 
/// Wms任务管理AutoMapper配置 
/// </summary> 
/// <seealso cref="AutoMapper.Profile" /> 
public class WmsTaskAutoMapperProfile : Profile 

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsTask/IWmsTaskRepository.cs

@@ -5,12 +5,12 @@
namespace CMS.Plugin.HIAWms.Domain.WmsTask; 
 
/// <summary> 
/// Wms任务管理表仓储 
/// Wms任务管理仓储 
/// </summary> 
public interface IWmsTaskRepository : IBasicRepository<WmsTask, Guid> 
{ 
    /// <summary> 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾Wms任务管理表 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾Wms任务管理 
    /// </summary> 
    /// <param name="name"></param> 
    /// <param name="cancellationToken"></param> 
@@ -18,7 +18,7 @@
    Task<WmsTask> FindByNameAsync(string name, CancellationToken cancellationToken = default); 
 
    /// <summary> 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨Wms任务管理表 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨Wms任务管理 
    /// </summary> 
    /// <param name="name"></param> 
    /// <param name="id"></param> 
@@ -26,13 +26,13 @@
    Task<bool> NameExistAsync(string name, Guid? id = null); 
 
    /// <summary> 
    /// èŽ·å–最大排序Wms任务管理表 
    /// èŽ·å–最大排序Wms任务管理 
    /// </summary> 
    /// <returns></returns> 
    Task<int> GetMaxSortAsync(); 
 
    /// <summary> 
    /// èŽ·å–分页列表Wms任务管理表 
    /// èŽ·å–分页列表Wms任务管理 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="sorting"></param> 
@@ -44,7 +44,7 @@
    Task<List<WmsTask>> GetListAsync(FunReturnResultModel<Expression<Func<WmsTask, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default); 
 
    /// <summary> 
    /// èŽ·å–总数Wms任务管理表 
    /// èŽ·å–总数Wms任务管理 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsTaskRepository.cs

@@ -11,7 +11,7 @@
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories; 
 
/// <summary> 
/// Wms任务管理表仓储实现 
/// Wms任务管理仓储实现 
/// </summary> 
public class EfCoreWmsTaskRepository : EfCoreRepository<ICMSPluginDbContext, WmsTask, Guid>, IWmsTaskRepository 
{ 
@@ -25,7 +25,7 @@
    } 
 
    /// <summary> 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾Wms任务管理表 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾Wms任务管理 
    /// </summary> 
    /// <param name="name"></param> 
    /// <param name="cancellationToken"></param> 
@@ -40,7 +40,7 @@
    } 
 
    /// <summary> 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨Wms任务管理表 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨Wms任务管理 
    /// </summary> 
    /// <param name="name">校验值</param> 
    /// <param name="id"></param> 
@@ -51,7 +51,7 @@
    } 
 
    /// <summary> 
    /// èŽ·å–最大排序Wms任务管理表 
    /// èŽ·å–最大排序Wms任务管理 
    /// </summary> 
    /// <returns></returns> 
    public async Task<int> GetMaxSortAsync() 
@@ -69,7 +69,7 @@
    } 
 
    /// <summary> 
    /// èŽ·å–分页列表Wms任务管理表 
    /// èŽ·å–分页列表Wms任务管理 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="sorting"></param> 
@@ -90,7 +90,7 @@
    } 
 
    /// <summary> 
    /// èŽ·å–总数Wms任务管理表 
    /// èŽ·å–总数Wms任务管理 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs

@@ -2,7 +2,7 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
using CmsQueryExtensions;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Web;

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs

@@ -13,7 +13,7 @@
namespace CMS.Plugin.HIAWms.Controller 
{ 
    /// <summary> 
    /// Wms任务管理表服务 
    /// Wms任务管理服务 
    /// </summary> 
    [ApiController] 
    [TypeFilter(typeof(CMSLanguageFilter))] 
@@ -35,7 +35,7 @@
        } 
 
        /// <summary> 
        /// èŽ·å–Wms任务管理表 
        /// èŽ·å–Wms任务管理 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
@@ -47,7 +47,7 @@
        } 
 
        /// <summary> 
        /// åˆ†é¡µèŽ·å–Wms任务管理表的列表. 
        /// åˆ†é¡µèŽ·å–Wms任务管理的列表. 
        /// </summary> 
        /// <param name="input">输入.</param> 
        /// <returns></returns> 
@@ -59,7 +59,7 @@
        } 
 
        /// <summary> 
        /// åˆ›å»ºWms任务管理表 
        /// åˆ›å»ºWms任务管理 
        /// </summary> 
        /// <param name="input">输入.</param> 
        /// <returns></returns> 
@@ -71,7 +71,7 @@
        } 
 
        /// <summary> 
        /// æ›´æ–°Wms任务管理表 
        /// æ›´æ–°Wms任务管理 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <param name="input">输入.</param> 
@@ -85,7 +85,7 @@
        } 
 
        /// <summary> 
        /// å…‹éš†Wms任务管理表 
        /// å…‹éš†Wms任务管理 
        /// </summary> 
        /// <param name="ids">Id集合.</param> 
        /// <returns></returns> 
@@ -98,7 +98,7 @@
        } 
 
        /// <summary> 
        /// åˆ é™¤Wms任务管理表 
        /// åˆ é™¤Wms任务管理 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
@@ -111,7 +111,7 @@
        } 
 
        /// <summary> 
        /// æ‰¹é‡åˆ é™¤Wms任务管理表 
        /// æ‰¹é‡åˆ é™¤Wms任务管理 
        /// </summary> 
        /// <param name="ids">The ids.</param> 
        /// <returns></returns> 
@@ -123,7 +123,7 @@
        } 
 
        /// <summary> 
        /// è°ƒæ•´æŽ’序Wms任务管理表 
        /// è°ƒæ•´æŽ’序Wms任务管理 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
@@ -135,7 +135,7 @@
        } 
 
        /// <summary> 
        /// å¯¼å…¥Wms任务管理表 
        /// å¯¼å…¥Wms任务管理 
        /// </summary> 
        /// <returns></returns> 
        [Authorize] 
@@ -164,7 +164,7 @@
        } 
 
        /// <summary> 
        /// å¯¼å‡ºWms任务管理表 
        /// å¯¼å‡ºWms任务管理 
        /// </summary> 
        /// <returns></returns> 
        [HttpGet] 

 HIAWms/web/src/config/menu.ts

@@ -14,16 +14,16 @@
    "notPage": false
  },
  {
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
    "patchName": "WmsInOutStockRecord",
    "name": "库存信息",
    "path": "/information-base/WmsMaterialStock",
    "patchName": "WmsMaterialStock",
    "icon": "p",
    "notPage": false
  },
  {
    "name": "库存信息",
    "path": "/information-base/WmsMaterialStock",
    "patchName": "WmsMaterialStock",
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
    "patchName": "WmsInOutStockRecord",
    "icon": "p",
    "notPage": false
  },
@@ -35,16 +35,16 @@
    "notPage": false
  },
  {
    "name": "API请求",
    "path": "/information-base/Http",
    "patchName": "Http",
    "name": "Wms物料基础",
    "path": "/information-base/HIAWms",
    "patchName": "HIAWms",
    "icon": "p",
    "notPage": false
  },
  {
    "name": "Wms物料基础",
    "path": "/information-base/HIAWms",
    "patchName": "HIAWms",
    "name": "API请求",
    "path": "/information-base/Http",
    "patchName": "Http",
    "icon": "p",
    "notPage": false
  }
@@ -64,17 +64,17 @@
    "icon": "p",
    "notPage": false
  },
  "WmsInOutStockRecord": {
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
    "patchName": "WmsInOutStockRecord",
    "icon": "p",
    "notPage": false
  },
  "WmsMaterialStock": {
    "name": "库存信息",
    "path": "/information-base/WmsMaterialStock",
    "patchName": "WmsMaterialStock",
    "icon": "p",
    "notPage": false
  },
  "WmsInOutStockRecord": {
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
    "patchName": "WmsInOutStockRecord",
    "icon": "p",
    "notPage": false
  },
@@ -85,18 +85,18 @@
    "icon": "p",
    "notPage": false
  },
  "Http": {
    "name": "API请求",
    "path": "/information-base/Http",
    "patchName": "Http",
    "icon": "p",
    "notPage": false
  },
  "HIAWms": {
    "name": "Wms物料基础",
    "path": "/information-base/HIAWms",
    "patchName": "HIAWms",
    "icon": "p",
    "notPage": false
  },
  "Http": {
    "name": "API请求",
    "path": "/information-base/Http",
    "patchName": "Http",
    "icon": "p",
    "notPage": false
  }
};

 HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx

@@ -16,7 +16,9 @@
import { cloneDeep } from 'lodash' 
 
export const useWmsInOutStockRecordQueryDrawer = (props: any, ctx?: any) => { 
  const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>('WmsInOutStockRecordDrawer') 
  const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>(
    'WmsInOutStockRecordDrawer'
  )
  /** 
   * ç”¨æ¥å¯¹æ¯”的初始化数据 
   */ 
@@ -41,7 +43,6 @@
      ></el-input-number> 
    ) 
  } 
 
 
  const visible = computed({ 
    get() { 
@@ -180,12 +181,12 @@
      certification: formData.value.certification, 
      remark: formData.value.remark, 
    } 
    return data; 
    return data
  } 
  const onClose = (done: () => void) => { 
    if (visible.value) { 
      visible.value = false 
      const data =commonGetFormData(); 
      const data = commonGetFormData()
      ctx.emit('close', data) 
    } 
  } 
@@ -193,7 +194,7 @@
   * ç¡®è®¤æŸ¥è¯¢ 
   */ 
  const onConfirmQuery = async () => { 
    const data =commonGetFormData(); 
    const data = commonGetFormData()
    ctx.emit('confirmQuery', data) 
  } 
  /** 
@@ -228,7 +229,7 @@
    formData.value.certification = '' 
    formData.value.remark = '' 
    //向父组件发送自定义事件 
    ctx.emit('restQuery'); 
    ctx.emit('restQuery')
  } 
 
  const updateCheckData = () => { 
@@ -255,7 +256,6 @@
 EnumName: 'StockTypeEnum', 
}) 
updateFormItemOptions('stockType', stockTypeEnumEnum) 
 
  } 
  commonQueryEnumForFrom() 
  /** 

 HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx

@@ -55,10 +55,45 @@
   */
  const formItems = reactive([
    {
      label: '巷道',
      prop: 'aisle',
                   label: '任务号', 
                   prop: 'taskNo', 
                   el: 'input', 
      //disabled: disabled,
      placeholder: '请输入巷道',
                   placeholder: '请输入任务号', 
              rules: [{required: true, message: '任务号不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务类型', 
                   prop: 'taskType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入任务类型', 
              rules: [{required: true, message: '任务类型不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务等级', 
                   prop: 'taskLevel', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入任务等级', 
              rules: [{required: true, message: '任务等级不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务状态', 
                   prop: 'taskStatus', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入任务状态', 
              rules: [{required: true, message: '任务状态不能为空', trigger: 'blur' }], 
    },
    {
      label: '托盘编号',
@@ -68,32 +103,124 @@
      placeholder: '请输入托盘编号',
    },
    {
                   label: '起始库位', 
                   prop: 'sourcePlace', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入起始库位', 
                }, 
                { 
                   label: '目标库位', 
                   prop: 'toPlace', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入目标库位', 
                }, 
                { 
                   label: '巷道', 
                   prop: 'aisle', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入巷道', 
                }, 
                { 
      label: '堆垛机ID',
      prop: 'dodeviceId',
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
      //disabled: disabled,
      placeholder: '请输入堆垛机ID',
    },
    {
      label: '设备类型',
      prop: 'dodevicetype',
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
      //disabled: disabled,
      placeholder: '请输入设备类型',
      rules: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
    },
    {
                   label: '设备任务状态', 
                   prop: 'taskDodeviceStatus', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入设备任务状态', 
              rules: [{required: true, message: '设备任务状态不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: 'WCS是否可以读取', 
                   prop: 'isRead', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入WCS是否可以读取', 
              rules: [{required: true, message: 'WCS是否可以读取不能为空', trigger: 'blur' }], 
                 options: [{label: '是',value: 'true'}, {label: '否',value: 'false'}] 
                }, 
                { 
                   label: '子任务类型', 
                   prop: 'sonTaskType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入子任务类型', 
                }, 
                { 
                   label: '来源单据号', 
                   prop: 'sourceOrderNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入来源单据号', 
                }, 
                { 
      label: '下个任务是否生成成功',
      prop: 'isNextTask',
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
      //disabled: disabled,
      placeholder: '请输入下个任务是否生成成功',
    },
    //   {
    //      label: 'WCS是否可以读取',
    //      prop: 'isRead',
    //      el: 'select',
    //      //disabled: disabled,
    //      placeholder: '请输入WCS是否可以读取',
    // rules: [{required: true, message: 'WCS是否可以读取不能为空', trigger: 'blur' }],
    //   },
    {
      label: '可变变量1',
      prop: 'mutableParam1',
@@ -114,74 +241,6 @@
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入可变变量3',
    },
    {
      label: '子任务类型',
      prop: 'sonTaskType',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入子任务类型',
    },
    {
      label: '来源单据号',
      prop: 'sourceOrderNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入来源单据号',
    },
    {
      label: '起始库位',
      prop: 'sourcePlace',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入起始库位',
    },
    {
      label: '设备任务状态',
      prop: 'taskDodeviceStatus',
      //disabled: disabled,
      placeholder: '请输入设备任务状态',
      rules: [
        { required: true, message: '设备任务状态不能为空', trigger: 'blur' },
      ],
    },
    {
      label: '任务等级',
      prop: 'taskLevel',
      //disabled: disabled,
      placeholder: '请输入任务等级',
      rules: [{ required: true, message: '任务等级不能为空', trigger: 'blur' }],
    },
    {
      label: '任务号',
      prop: 'taskNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入任务号',
      rules: [{ required: true, message: '任务号不能为空', trigger: 'blur' }],
    },
    {
      label: '任务状态',
      prop: 'taskStatus',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入任务状态',
      rules: [{ required: true, message: '任务状态不能为空', trigger: 'blur' }],
    },
    {
      label: '任务类型',
      prop: 'taskType',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入任务类型',
      rules: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }],
    },
    {
      label: '目标库位',
      prop: 'toPlace',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入目标库位',
    },
  ])
  /**
@@ -218,24 +277,24 @@
  const onConfirm = async () => {
    await formRef.value?.validate()
    const data = {
      aisle: formData.value.aisle,
      taskNo: formData.value.taskNo, 
taskType: formData.value.taskType, 
taskLevel: formData.value.taskLevel, 
taskStatus: formData.value.taskStatus, 
      containerNo: formData.value.containerNo,
sourcePlace: formData.value.sourcePlace, 
toPlace: formData.value.toPlace, 
aisle: formData.value.aisle, 
      dodeviceId: formData.value.dodeviceId,
      dodevicetype: formData.value.dodevicetype,
      isNextTask: formData.value.isNextTask,
taskDodeviceStatus: formData.value.taskDodeviceStatus, 
      isRead: formData.value.isRead,
sonTaskType: formData.value.sonTaskType, 
sourceOrderNo: formData.value.sourceOrderNo, 
isNextTask: formData.value.isNextTask, 
      mutableParam1: formData.value.mutableParam1,
      mutableParam2: formData.value.mutableParam2,
      mutableParam3: formData.value.mutableParam3,
      sonTaskType: formData.value.sonTaskType,
      sourceOrderNo: formData.value.sourceOrderNo,
      sourcePlace: formData.value.sourcePlace,
      taskDodeviceStatus: formData.value.taskDodeviceStatus,
      taskLevel: formData.value.taskLevel,
      taskNo: formData.value.taskNo,
      taskStatus: formData.value.taskStatus,
      taskType: formData.value.taskType,
      toPlace: formData.value.toPlace,
    }
    if (!current.value) {
      await wmsTaskDrawer.addWmsTask(data)
@@ -279,6 +338,7 @@
      EnumName: 'SonTaskTypeEnum',
    })
    updateFormItemOptions('sonTaskType', sonTaskTypeEnumEnum)
 
  }
  commonQueryEnumForFrom()
  /**
@@ -289,24 +349,24 @@
      const res = await wmsTaskDrawer.getWmsTaskDetail(current.value)

      formData.value = {
        aisle: res.aisle,
        taskNo: res.taskNo, 
taskType: res.taskType, 
taskLevel: res.taskLevel, 
taskStatus: res.taskStatus, 
        containerNo: res.containerNo,
sourcePlace: res.sourcePlace, 
toPlace: res.toPlace, 
aisle: res.aisle, 
        dodeviceId: res.dodeviceId,
        dodevicetype: res.dodevicetype,
        isNextTask: res.isNextTask,
taskDodeviceStatus: res.taskDodeviceStatus, 
        isRead: res.isRead,
sonTaskType: res.sonTaskType, 
sourceOrderNo: res.sourceOrderNo, 
isNextTask: res.isNextTask, 
        mutableParam1: res.mutableParam1,
        mutableParam2: res.mutableParam2,
        mutableParam3: res.mutableParam3,
        sonTaskType: res.sonTaskType,
        sourceOrderNo: res.sourceOrderNo,
        sourcePlace: res.sourcePlace,
        taskDodeviceStatus: res.taskDodeviceStatus,
        taskLevel: res.taskLevel,
        taskNo: res.taskNo,
        taskStatus: res.taskStatus,
        taskType: res.taskType,
        toPlace: res.toPlace,
        id: res.id,
      }
      disabled.value = true

 HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx

@@ -42,6 +42,29 @@
    ) 
  } 
 
  const datePickerRange = (attrs) => {
    return (
      <el-date-picker
        type="daterange"
        value-format="YYYY-MM-DD HH:mm:ss"
        start-placeholder="开始日期"
        end-placeholder="结束日期"
        {...attrs}
      ></el-date-picker>
    )
  }

  const dateTimePickerRange = (attrs) => {
    return (
      <el-date-picker
        type="datetimerange"
        value-format="YYYY-MM-DD HH:mm:ss"
        start-placeholder="开始日期"
        end-placeholder="结束日期"
        {...attrs}
      ></el-date-picker>
    )
  }
 
  const visible = computed({ 
    get() { 
@@ -56,10 +79,40 @@
   */ 
  const formItems = reactive([ 
                    { 
                   label: '巷道', 
                   prop: 'aisle', 
      label: '任务号',
      prop: 'taskNo',
      el: 'input',
                   //disabled: disabled, 
                   placeholder: '请输入巷道', 
      placeholder: '请输入任务号',
    },
    {
      label: '任务类型',
      prop: 'taskType',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入任务类型',
    },
    {
      label: '任务等级',
      prop: 'taskLevel',
      el: (props: any, { attrs }: SetupContext) => {
        return h(inputNumber, {
          ...props,
          clearable: true,
          ...attrs,
        })
      },
      step: 1,
      precision: 0,
      //disabled: disabled,
      placeholder: '请输入任务等级',
    },
    {
      label: '任务状态',
      prop: 'taskStatus',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入任务状态',
                }, 
                { 
                   label: '托盘编号', 
@@ -69,22 +122,78 @@
                   placeholder: '请输入托盘编号', 
                }, 
                { 
      label: '起始库位',
      prop: 'sourcePlace',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入起始库位',
    },
    {
      label: '目标库位',
      prop: 'toPlace',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入目标库位',
    },
    {
      label: '巷道',
      prop: 'aisle',
      el: (props: any, { attrs }: SetupContext) => {
        return h(inputNumber, {
          ...props,
          clearable: true,
          ...attrs,
        })
      },
      step: 1,
      precision: 0,
      //disabled: disabled,
      placeholder: '请输入巷道',
    },
    {
                   label: '堆垛机ID', 
                   prop: 'dodeviceId', 
      el: (props: any, { attrs }: SetupContext) => {
        return h(inputNumber, {
          ...props,
          clearable: true,
          ...attrs,
        })
      },
      step: 1,
      precision: 0,
                   //disabled: disabled, 
                   placeholder: '请输入堆垛机ID', 
                }, 
                { 
                   label: '设备类型', 
                   prop: 'dodevicetype', 
      el: (props: any, { attrs }: SetupContext) => {
        return h(inputNumber, {
          ...props,
          clearable: true,
          ...attrs,
        })
      },
      step: 1,
      precision: 0,
                   //disabled: disabled, 
                   placeholder: '请输入设备类型', 
                }, 
                { 
                   label: '下个任务是否生成成功', 
                   prop: 'isNextTask', 
      label: '设备任务状态',
      prop: 'taskDodeviceStatus',
      el: (props: any, { attrs }: SetupContext) => {
        return h(inputNumber, {
          ...props,
          clearable: true,
          ...attrs,
        })
      },
      step: 1,
      precision: 0,
                   //disabled: disabled, 
                   placeholder: '请输入下个任务是否生成成功', 
      placeholder: '请输入设备任务状态',
                }, 
                { 
                   label: 'WCS是否可以读取', 
@@ -92,6 +201,39 @@
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入WCS是否可以读取', 
      options: [
        { label: '是', value: 'true' },
        { label: '否', value: 'false' },
      ],
    },
    {
      label: '子任务类型',
      prop: 'sonTaskType',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入子任务类型',
    },
    {
      label: '来源单据号',
      prop: 'sourceOrderNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入来源单据号',
    },
    {
      label: '下个任务是否生成成功',
      prop: 'isNextTask',
      el: (props: any, { attrs }: SetupContext) => {
        return h(inputNumber, {
          ...props,
          clearable: true,
          ...attrs,
        })
      },
      step: 1,
      precision: 0,
      //disabled: disabled,
      placeholder: '请输入下个任务是否生成成功',
                }, 
                { 
                   label: '可变变量1', 
@@ -114,66 +256,21 @@
                   //disabled: disabled, 
                   placeholder: '请输入可变变量3', 
                }, 

                { 
                   label: '子任务类型', 
                   prop: 'sonTaskType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入子任务类型', 
      label: '创建时间',
      prop: 'operateTime',
      el: (props: any, { attrs }: SetupContext) => {
        return h(datePickerRange, {
          ...props,
          clearable: true,
          ...attrs,
        })
                }, 
                { 
                   label: '来源单据号', 
                   prop: 'sourceOrderNo', 
                   el: 'input', 
      step: 1,
      precision: 0,
                   //disabled: disabled, 
                   placeholder: '请输入来源单据号', 
                }, 
                { 
                   label: '起始库位', 
                   prop: 'sourcePlace', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入起始库位', 
                }, 
                { 
                   label: '设备任务状态', 
                   prop: 'taskDodeviceStatus', 
                   //disabled: disabled, 
                   placeholder: '请输入设备任务状态', 
                }, 
                { 
                   label: '任务等级', 
                   prop: 'taskLevel', 
                   //disabled: disabled, 
                   placeholder: '请输入任务等级', 
                }, 
                { 
                   label: '任务号', 
                   prop: 'taskNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入任务号', 
                }, 
                { 
                   label: '任务状态', 
                   prop: 'taskStatus', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入任务状态', 
                }, 
                { 
                   label: '任务类型', 
                   prop: 'taskType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入任务类型', 
                }, 
                { 
                   label: '目标库位', 
                   prop: 'toPlace', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入目标库位', 
      placeholder: '请输入下个任务是否生成成功',
                },  
  ]) 
  /** 
@@ -187,32 +284,34 @@
    return check 
  } 
  const commonGetFormData=()=>{ 
    console.log(formData.value.operateTime)
    const data = { 
      Aisle: formData.value.Aisle, 
      TaskNo: formData.value.TaskNo,
      TaskType: formData.value.TaskType,
      TaskLevel: formData.value.TaskLevel,
      TaskStatus: formData.value.TaskStatus,
ContainerNo: formData.value.ContainerNo, 
      SourcePlace: formData.value.SourcePlace,
      ToPlace: formData.value.ToPlace,
      Aisle: formData.value.Aisle,
DodeviceId: formData.value.DodeviceId, 
Dodevicetype: formData.value.Dodevicetype, 
IsNextTask: formData.value.IsNextTask, 
      TaskDodeviceStatus: formData.value.TaskDodeviceStatus,
IsRead: formData.value.IsRead, 
      SonTaskType: formData.value.SonTaskType,
      SourceOrderNo: formData.value.SourceOrderNo,
      IsNextTask: formData.value.IsNextTask,
MutableParam1: formData.value.MutableParam1, 
MutableParam2: formData.value.MutableParam2, 
MutableParam3: formData.value.MutableParam3, 
SonTaskType: formData.value.SonTaskType, 
SourceOrderNo: formData.value.SourceOrderNo, 
SourcePlace: formData.value.SourcePlace, 
TaskDodeviceStatus: formData.value.TaskDodeviceStatus, 
TaskLevel: formData.value.TaskLevel, 
TaskNo: formData.value.TaskNo, 
TaskStatus: formData.value.TaskStatus, 
TaskType: formData.value.TaskType, 
ToPlace: formData.value.ToPlace,  
      operateTime: formData.value.operateTime,
    } 
    return data; 
    return data
  } 
  const onClose = (done: () => void) => { 
    if (visible.value) { 
      visible.value = false 
      const data =commonGetFormData(); 
      const data = commonGetFormData()
      ctx.emit('close', data) 
    } 
  } 
@@ -220,7 +319,7 @@
   * ç¡®è®¤æŸ¥è¯¢ 
   */ 
  const onConfirmQuery = async () => { 
    const data =commonGetFormData(); 
    const data = commonGetFormData()
    ctx.emit('confirmQuery', data) 
  } 
  /** 
@@ -228,26 +327,27 @@
   */ 
  const onReset = async () => { 
    formData.value = {} 
    formData.value.Aisle = '' 
    formData.value.TaskNo = ''
    formData.value.TaskType = ''
    formData.value.TaskLevel = ''
    formData.value.TaskStatus = ''
formData.value.ContainerNo = '' 
    formData.value.SourcePlace = ''
    formData.value.ToPlace = ''
    formData.value.Aisle = ''
formData.value.DodeviceId = '' 
formData.value.Dodevicetype = '' 
formData.value.IsNextTask = '' 
    formData.value.TaskDodeviceStatus = ''
formData.value.IsRead = '' 
    formData.value.SonTaskType = ''
    formData.value.SourceOrderNo = ''
    formData.value.IsNextTask = ''
formData.value.MutableParam1 = '' 
formData.value.MutableParam2 = '' 
formData.value.MutableParam3 = '' 
formData.value.SonTaskType = '' 
formData.value.SourceOrderNo = '' 
formData.value.SourcePlace = '' 
formData.value.TaskDodeviceStatus = '' 
formData.value.TaskLevel = '' 
formData.value.TaskNo = '' 
formData.value.TaskStatus = '' 
formData.value.TaskType = '' 
formData.value.ToPlace = ''  
    formData.value.operateTime = []
    //向父组件发送自定义事件 
    ctx.emit('restQuery'); 
    ctx.emit('restQuery')
  } 
 
  const updateCheckData = () => { 
@@ -282,7 +382,6 @@
 EnumName: 'SonTaskTypeEnum', 
}) 
updateFormItemOptions('sonTaskType', sonTaskTypeEnumEnum) 
 
  } 
  commonQueryEnumForFrom() 
  /** 

 HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts

@@ -13,6 +13,10 @@
    title: '任务类型',
  },
  {
  field: 'taskLevel', 
  title: '任务等级', 
}, 
{ 
    field: 'taskStatusDesc',
    title: '任务状态',
  },
@@ -32,22 +36,21 @@
    field: 'aisle',
    title: '巷道',
  },
  // {
  //   field: 'dodeviceId',
  //   title: '堆垛机ID',
  //   width: 100,
  // },
{ 
  field: 'dodeviceId', 
  title: '堆垛机ID', 
}, 
{ 
  field: 'dodevicetype', 
  title: '设备类型', 
}, 
  {
    field: 'taskDodeviceStatus',
    title: '设备状态',
  title: '设备任务状态', 
  },
  {
    field: 'isRead',
    title: 'WCS可读',
  },
  {
    field: 'taskLevel',
    title: '优先级',
  title: 'WCS是否可以读取', 
  },
  {
    field: 'sonTaskTypeDesc',
@@ -55,43 +58,34 @@
  },
  {
    field: 'sourceOrderNo',
    title: '来源单号',
  title: '来源单据号', 
  },
  {
    field: 'isNextTask',
    title: '后续任务',
  title: '下个任务是否生成成功', 
  },
  {
    field: 'dodevicetype',
    title: '设备类型',
  field: 'mutableParam1', 
  title: '可变变量1', 
  },

{ 
  field: 'mutableParam2', 
  title: '可变变量2', 
}, 
{ 
  field: 'mutableParam3', 
  title: '可变变量3', 
}, 
{ 
  field: 'sort', 
  title: '排序', 
}, 
  {
    field: 'creationTime',
    title: '创建时间',
  title: '', 
  },
  // {
  //   field: 'sort',
  //   title: '排序',
  //   width: 80,
  // },
  // // ä»¥ä¸‹ä¸ºæ¬¡è¦ä¿¡æ¯æ”¾åœ¨æœ€åŽ
  // {
  //   field: 'mutableParam1',
  //   title: '变量1',
  //   width: 100,
  //   showOverflow: true, // é•¿æ–‡æœ¬æ˜¾ç¤ºçœç•¥å·
  // },
  // {
  //   field: 'mutableParam2',
  //   title: '变量2',
  //   width: 100,
  //   showOverflow: true,
  // },
  // {
  //   field: 'mutableParam3',
  //   title: '变量3',
  //   width: 100,
  //   showOverflow: true,
  // },
{ 
  field: 'deletionTime', 
  title: '', 
},  
]

 HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.module.scss

@@ -15,7 +15,7 @@
  .header { 
    margin-bottom: 12px; 
    display: flex; 
    justify-content: flex-start; 
    justify-content: flex-end; 
    align-items: center; 
  } 
} 

 HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx

@@ -10,7 +10,9 @@
import { columns } from './Config'
import TdButton from '@/components/TdButton/TdButton'
import { vPermission } from '@/libs/Permission/Permission'
import { getWmsEnumData } from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer'
import { 
  getWmsEnumData 
} from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer' 
import {
  ElInput,
  ElSelect,
@@ -61,15 +63,18 @@
    } = useWmsTask(props, ctx)

    //定义高级查询引用
    const wmsTaskQueryDrawerRef = ref(null)
   const wmsTaskQueryDrawerRef=ref(null); 
    // æ–°å¢žçš„查询条件
    const queryForm = ref({
      searchVal: '',
      str_searchFormInputAttrs: [],
      str_searchFormInputAttrs:[] 
    })
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题)
    const _searchFormInputAttrs = ref(['TaskNo', 'ContainerNo'])
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码')
    const _searchFormInputAttrs = ref([ 
     'TaskNo', 'ContainerNo' 
    ]); 
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码'); 
     

    // åŠ¨æ€æžšä¸¾é€‰é¡¹
    const enumOptions = reactive({
@@ -102,6 +107,7 @@
          label: item.description,
          value: item.value,
        }))
 
      } catch (error) {
        console.error('获取枚举数据失败:', error)
      }
@@ -113,45 +119,40 @@
    })

    // å®šä¹‰å“åº”式查询数据
    const _curHighQueryData = ref({
      searchVal: '',
      str_searchFormInputAttrs: [],
    })
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] }); 
    // æ–°ç‰ˆçš„查询方法（主页面中的按钮【查询】）
    const handleQueryForMain = async () => {
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
      _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
      tableRef.value.getList(_curHighQueryData.value)
    }
    // æ–°ç‰ˆçš„查询方法（高级查询中的按钮【查询】）
    const handleQuery = async (extraParams = {}) => {
      let filteredData = commonGetHighQueryForm(extraParams)
      commonSaveCurHighQueryData(filteredData)
      let filteredData = commonGetHighQueryForm(extraParams); 
      commonSaveCurHighQueryData(filteredData); 
      tableRef.value.getList(filteredData)
    }
    // æ–°ç‰ˆçš„查询重置
    const resetQuery = () => {
      queryForm.value.searchVal = ''
      queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value; 
    }
    //新版的导出方法
    const handleExport = () => {
      onExport(_curHighQueryData.value)
      onExport(_curHighQueryData.value); 
    }
    // æ–°ç‰ˆçš„查询弹出框关闭方法
    const closeQuery = (extraParams = {}) => {
      let filteredData = commonGetHighQueryForm(extraParams)
      console.log('closeQuery方法')
      console.log(filteredData)
      commonSaveCurHighQueryData(filteredData)
      let filteredData = commonGetHighQueryForm(extraParams); 
      console.log("closeQuery方法"); 
      console.log(filteredData); 
      commonSaveCurHighQueryData(filteredData); 
    }
    //保存查询值
    const commonSaveCurHighQueryData = (filteredData = {}) => {
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }; 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
    }
    //获取高级查询弹出框的查询值
    const commonGetHighQueryForm = (extraParams = {}) => {
@@ -164,9 +165,10 @@
      )
      //组合模糊查询
      filteredData.searchVal = queryForm.value.searchVal
      filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
      return filteredData
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
      return filteredData; 
    }
    

    /**
     * @returns è¡¨æ ¼
@@ -292,11 +294,7 @@
                  class={styles.formItem}
                />
              </ElFormItem>
              <IconButton
                type="primary"
                icon="search"
                onClick={handleQueryForMain}
              >
              <IconButton type="primary" icon="search" onClick={handleQueryForMain}> 
                æŸ¥è¯¢
              </IconButton>
              {/* <IconButton style="" icon="refresh" onClick={resetQuery}> 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/DataBaseFactory/Default/MySqlDataBaseServiceHandle.cs

@@ -15,7 +15,7 @@
            //string strSql = $"SELECT COLUMN_NAME as ColumnName, COLUMN_TYPE as DataType, IS_NULLABLE as IsNullable, CHARACTER_MAXIMUM_LENGTH as DataLength,COLUMN_COMMENT as Description " +
            //                       $"FROM INFORMATION_SCHEMA.COLUMNS " +
            //                       $"WHERE  TABLE_NAME = '{tableName}'";
            string strSql = $"SELECT c.COLUMN_NAME as ColumnName, c.DATA_TYPE as DataType, c.IS_NULLABLE as IsNullable, c.CHARACTER_MAXIMUM_LENGTH as DataLength, c.COLUMN_COMMENT as Description,c.NUMERIC_SCALE as MyPrecision, " +
            string strSql = $"SELECT DISTINCT c.COLUMN_NAME as ColumnName, c.DATA_TYPE as DataType, c.IS_NULLABLE as IsNullable, c.CHARACTER_MAXIMUM_LENGTH as DataLength, c.COLUMN_COMMENT as Description,c.NUMERIC_SCALE as MyPrecision, " +
                $"CASE WHEN kcu.COLUMN_NAME IS NOT NULL THEN 'true' ELSE 'false' END AS IsPrimaryKey " +
                $"FROM INFORMATION_SCHEMA.COLUMNS c " +
                $"LEFT JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu " +

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Controllers/EntityModeDrawerÄ£°å.txt

@@ -41,6 +41,25 @@
      ></el-input-number>
    )
  }
    const datePicker = (attrs) => {
    return (
      <el-date-picker
        type="datetime"
        format="YYYY-MM-DD"
        {...attrs}
      ></el-date-picker>
    )
  }

   const dateTimePicker = (attrs) => {
    return (
      <el-date-picker
        type="datetime"
        format="YYYY-MM-DD HH:mm:ss"
        {...attrs}
      ></el-date-picker>
    )
  }

  const visible = computed({
    get() {

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/StructStrHelper.cs

@@ -1863,7 +1863,15 @@
                    switch (enumDT)
                    {
                        case DataTypeEnum.dt_datetime:
                            sb.Append("                   type: 'datetimerange', \n");
                            sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
                            sb.Append("                     return h(datePicker, {  \n");
                            sb.Append("                       ...props,  \n");
                            sb.Append("                       clearable: true,  \n");
                            sb.Append("                       ...attrs,  \n");
                            sb.Append("                     })  \n");
                            sb.Append("                   },\n");

                            sb.Append("                   width: '100%',\n");
                            break;
                        default:
                            break;
@@ -1879,12 +1887,14 @@
                        sb.Append("                     })  \n");
                        sb.Append("                   },\n");

                        sb.Append("                   width: '100%',\n");
                        //配置精度？这里需要获取数据库中的精度！！！TODO：
                        sb.Append("                   step: 0.01,\n");
                        sb.Append("                   precision: 2, \n");
                    }
                    else if (enumDT == DataTypeEnum.dt_int)
                    {
                        bool isWriteInt = true;
                        //判断是否是下拉类型
                        //增加对枚举类型的支持 
                        if (param.EnumList?.Count > 0)
@@ -1894,9 +1904,10 @@
                            {
                                elment = "select";
                                sb.Append("                   el: '" + elment + "', \n");
                                isWriteInt = false;
                            }
                        }
                        else
                        if(isWriteInt)
                        {
                            sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
                            sb.Append("                     return h(inputNumber, {  \n");
@@ -1905,7 +1916,7 @@
                            sb.Append("                       ...attrs,  \n");
                            sb.Append("                     })  \n");
                            sb.Append("                   },\n");

                            sb.Append("                   width: '100%',\n");
                            //配置精度？
                            sb.Append("                   step: 1,\n");
                            sb.Append("                   precision: 0, \n");
@@ -1923,15 +1934,15 @@
                        sb.Append("              rules: [{required: true, message: '" + columnModel.Description + "不能为空', trigger: 'blur' }], \n");
                    }
                    //添加类型
                    //switch (enumDT)
                    //{
                    //    case DataTypeEnum.dt_bit:
                    //    case DataTypeEnum.dt_tinyint:
                    //        sb.Append("                 options: [{label: '是',value: 'true'}, {label: '否',value: 'false'}] \n");
                    //        break;
                    //    default:
                    //        break;
                    //}
                    switch (enumDT)
                    {
                        case DataTypeEnum.dt_bit:
                        case DataTypeEnum.dt_tinyint:
                            sb.Append("                 options: [{label: '是',value: 'true'}, {label: '否',value: 'false'}] \n");
                            break;
                        default:
                            break;
                    }
                    sb.Append("                }, \n");
                }
                //去掉最后一个,
@@ -2007,12 +2018,14 @@
                        sb.Append("                     })  \n");
                        sb.Append("                   },\n");

                        sb.Append("                   width: '100%',\n");
                        //配置精度？这里需要获取数据库中的精度！！！TODO：
                        sb.Append("                   step: 0.01,\n");
                        sb.Append("                   precision: 2, \n");
                    }
                    else if (enumDT == DataTypeEnum.dt_int)
                    {
                        bool isWriteInt = true;
                        //判断是否是下拉类型
                        //增加对枚举类型的支持 
                        if (param.EnumList?.Count > 0)
@@ -2022,9 +2035,10 @@
                            {
                                elment = "select";
                                sb.Append("                   el: '" + elment + "', \n");
                                isWriteInt = false;
                            }
                        }
                        else
                        if (isWriteInt)
                        {
                            sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
                            sb.Append("                     return h(inputNumber, {  \n");
@@ -2034,6 +2048,7 @@
                            sb.Append("                     })  \n");
                            sb.Append("                   },\n");

                            sb.Append("                   width: '100%',\n");
                            //配置精度？
                            sb.Append("                   step: 1,\n");
                            sb.Append("                   precision: 0, \n");
@@ -2048,15 +2063,15 @@
                    sb.Append("                   placeholder: '请输入" + columnModel.Description + "', \n");

                    //添加类型
                    //switch (enumDT)
                    //{
                    //    case DataTypeEnum.dt_bit:
                    //    case DataTypeEnum.dt_tinyint:
                    //        sb.Append("                 options: [{label: '是',value: 'true'}, {label: '否',value: 'false'}] \n");
                    //        break;
                    //    default:
                    //        break;
                    //}
                    switch (enumDT)
                    {
                        case DataTypeEnum.dt_bit:
                        case DataTypeEnum.dt_tinyint:
                            sb.Append("                 options: [{label: '是',value: 'true'}, {label: '否',value: 'false'}] \n");
                            break;
                        default:
                            break;
                    }
                    sb.Append("                }, \n");
                }
                //去掉最后一个,

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/WhereConditionsExtensions.cs

@@ -155,11 +155,17 @@
                        {
                            continue;
                        }
                        List<string> arr_value = v as List<string>;
                        if (arr_value.Count < 2)
                        //判断字符串是否有,号
                        List<string> arr_value = new List<string>();
                        string str_arr_value = v as string;
                        if (string.IsNullOrEmpty(str_arr_value)) continue;
                        if (str_arr_value.IndexOf(',') > -1)
                        {
                            continue;
                            var arr = str_arr_value.Split(',');
                            if (arr.Length != 2) continue;
                            arr_value = arr.ToList();
                        }

                        //string[] arr_value = (string[])v;
                        //string[] arr_value = Convert.ToString(v).Split(',');
                        hsmForDatetimeList.Add(new HighSearchForDateTimeRangeModel()