zs
2025-05-06 1473745cf39e94933179276a6d533bff2ceff79d
任务管理
已添加36个文件
已修改5个文件
3927 ■■■■■ 文件已修改
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs 311 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateDto.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs 145 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskUpdateDto.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTasksImportModel.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsTaskAppService.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsTaskAppService.cs 456 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsTaskAutoMapperProfile.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsTask/IWmsTaskRepository.cs 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsTaskRepository.cs 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs 188 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/config/menu.ts 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/Config.ts 122 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Controllers/File.ts 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTask.ts 275 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx 332 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx 308 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Models/Service/WmsTask.ts 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Models/Service/WmsTaskDrawer.ts 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Models/Service/WmsTaskQueryDrawer.ts 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Models/WmsTask.ts 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Models/WmsTaskDrawer.ts 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Models/WmsTaskQueryDrawer.ts 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskDrawer/WmsTaskDrawer.module.scss 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskDrawer/WmsTaskDrawer.tsx 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.module.scss 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.tsx 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.module.scss 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx 324 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/WmsTask.module.scss 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/WmsTask.tsx 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/Views/config/WmsTask.json 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/enum.ts 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/index.ts 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/web/src/widgets/WmsTask/type/type.d.ts 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/MainForm.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Templete/AppService/AppService模板.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeQueryDrawer模板.txt 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,311 @@
using CmsQueryExtensions.Extension;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
/// Wms任务管理表查询参数
/// </summary>
public class GetWmsTaskInput : ExtensiblePagedAndSortedResultRequestDto
{
    #region å…³é”®å­—查询
    /// <summary>
    /// å…³é”®å­—模糊查询(注意是小写!)
    /// </summary>
    public string searchVal { get; set; }
    /// <summary>
    /// é€šç”¨æŸ¥è¯¢é…ç½® (1:模糊查询 , 2:精准查询)(注意是小写!)
    /// </summary>
    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// å­æœç´¢ç»„件传递的通用查询配置的属性名(注意是小写!)
    /// </summary>
    [NoAutoQuery]
    public string str_searchFormInputAttrs { get; set; }
    /// <summary>
    /// å­æœç´¢ç»„件传递的通用查询配置的属性名(注意是小写!)
    /// </summary>
    public List<string> searchFormInputAttrs
    {
        get
        {
            if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
            {
                return str_searchFormInputAttrs.Split(',').ToList();
            }
            return new List<string>();
        }
    }
    #endregion
            /// <summary>
        /// å··é“
        /// </summary>
        public int?  Aisle { get; set; }
        /// <summary>
        /// å··é“-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum Aisle_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        public string ContainerNo { get; set; }
        /// <summary>
        /// æ‰˜ç›˜ç¼–号-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        ///
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> CreationTime { get; set; }
        /// <summary>
        ///
        /// </summary>
        public string CreatorId { get; set; }
        /// <summary>
        /// -查询关系运算符
        /// </summary>
        public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        ///
        /// </summary>
        public string DeleterId { get; set; }
        /// <summary>
        /// -查询关系运算符
        /// </summary>
        public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        ///
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> DeletionTime { get; set; }
        /// <summary>
        /// å †åž›æœºID
        /// </summary>
        public int?  DodeviceId { get; set; }
        /// <summary>
        /// å †åž›æœºID-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum DodeviceId_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        /// è®¾å¤‡ç±»åž‹
        /// </summary>
        public int?  Dodevicetype { get; set; }
        /// <summary>
        /// è®¾å¤‡ç±»åž‹-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum Dodevicetype_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        ///
        /// </summary>
        public bool?  IsDeleted { 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.精准查询;
        /// <summary>
        /// WCS是否可以读取
        /// </summary>
        public bool?  IsRead { get; set; }
        /// <summary>
        /// WCS是否可以读取-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum IsRead_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        ///
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> LastModificationTime { get; set; }
        /// <summary>
        ///
        /// </summary>
        public string LastModifierId { get; set; }
        /// <summary>
        /// -查询关系运算符
        /// </summary>
        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å¯å˜å˜é‡1
        /// </summary>
        public string MutableParam1 { get; set; }
        /// <summary>
        /// å¯å˜å˜é‡1-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum MutableParam1_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å¯å˜å˜é‡2
        /// </summary>
        public string MutableParam2 { get; set; }
        /// <summary>
        /// å¯å˜å˜é‡2-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum MutableParam2_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å¯å˜å˜é‡3
        /// </summary>
        public string MutableParam3 { get; set; }
        /// <summary>
        /// å¯å˜å˜é‡3-查询关系运算符
        /// </summary>
        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; }
        /// <summary>
        /// æŽ’序-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        /// æ¥æºå•据号
        /// </summary>
        public string SourceOrderNo { get; set; }
        /// <summary>
        /// æ¥æºå•据号-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum SourceOrderNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// èµ·å§‹åº“位
        /// </summary>
        public string SourcePlace { get; set; }
        /// <summary>
        /// èµ·å§‹åº“位-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// è®¾å¤‡ä»»åŠ¡çŠ¶æ€
        /// </summary>
        public int?  TaskDodeviceStatus { get; set; }
        /// <summary>
        /// è®¾å¤‡ä»»åŠ¡çŠ¶æ€-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum TaskDodeviceStatus_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        /// ä»»åŠ¡ç­‰çº§
        /// </summary>
        public int?  TaskLevel { get; set; }
        /// <summary>
        /// ä»»åŠ¡ç­‰çº§-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum TaskLevel_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        /// ä»»åŠ¡å·
        /// </summary>
        public string TaskNo { get; set; }
        /// <summary>
        /// ä»»åŠ¡å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        public int?  TaskStatus { get; set; }
        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum TaskStatus_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        public int?  TaskType { 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
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
/// Wms任务管理表创建参数对象
/// </summary>
public class WmsTaskCreateDto : WmsTaskCreateOrUpdateDtoBase
{
    /// <summary>
    /// æŽ’序
    /// </summary>
    public virtual int? Sort { get; set; }
    /// <summary>
    /// æ˜¯å¦ç¦ç”¨
    /// </summary>
    public bool? IsDisabled { get; set; } = false;
}
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,130 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using System;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
/// Wms任务管理表创建或更新基类
/// </summary>
public abstract class WmsTaskCreateOrUpdateDtoBase : ExtensibleEntityDto
{
            /// <summary>
        /// å··é“
        /// </summary>
        public int? Aisle { get; set; }
        /// <summary>
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        public string? ContainerNo { get; set; }
        /// <summary>
        ///
        /// </summary>
        public string? CreatorId { get; set; }
        /// <summary>
        /// å †åž›æœºID
        /// </summary>
        public int? DodeviceId { get; set; }
        /// <summary>
        /// è®¾å¤‡ç±»åž‹
        /// </summary>
        public int Dodevicetype { 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 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 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>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        public WmsTaskStatus TaskStatus { get; set; }
        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        public TaskTypeEnum TaskType { get; set; }
        /// <summary>
        /// ç›®æ ‡åº“位
        /// </summary>
        public string? ToPlace { get; set; }
    /// <summary>
    /// Initializes a new instance of the <see cref="WmsTaskCreateOrUpdateDtoBase"/> class.
    /// </summary>
    public WmsTaskCreateOrUpdateDtoBase() : base(false)
    {
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,205 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
/// Wms任务管理表数据参数对象
/// </summary>
public  class WmsTaskDto:  ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
{
            /// <summary>
        /// å··é“
        /// </summary>
        public int? Aisle { get; set; }
        /// <summary>
        ///
        /// </summary>
        public string? ConcurrencyStamp { 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
        {
            get
            {
                return GetEnumDescriptionUtil.GetEnumDescription(SonTaskType);
            }
        }
        /// <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>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        public WmsTaskStatus TaskStatus { get; set; }
        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        public string TaskStatusDesc
        {
            get
            {
                return GetEnumDescriptionUtil.GetEnumDescription(TaskStatus);
            }
        }
        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        public TaskTypeEnum TaskType { get; set; }
        /// <summary>
        /// ä»»åŠ¡ç±»åž‹
        /// </summary>
        public string TaskTypeDesc
        {
            get
            {
                return GetEnumDescriptionUtil.GetEnumDescription(TaskType);
            }
        }
        /// <summary>
        /// ç›®æ ‡åº“位
        /// </summary>
        public string? ToPlace { get; set; }
    /// <summary>
    /// Gets the export data.
    /// </summary>
    /// <returns></returns>
    public Dictionary<string, object> GetExportData()
    {
        var exportData = new Dictionary<string, object>();
        foreach (var property in this.GetType().GetProperties())
        {
            exportData.Add(property.Name, property.GetValue(this));
        }
        return exportData;
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
using MiniExcelLibs.Attributes;
using System.ComponentModel.DataAnnotations;
using System;
using System.ComponentModel;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
/// Wms任务管理表导出模型
/// </summary>
public  class WmsTaskExportModel
{
            /// <summary>
        /// å··é“
        /// </summary>
        [ExcelColumn(Name = "巷道", Width = 25)]
        public int? Aisle { get; set; }
        /// <summary>
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        [ExcelColumn(Name = "托盘编号", Width = 25)]
        public string ContainerNo { get; set; }
        /// <summary>
        /// å †åž›æœºID
        /// </summary>
        [ExcelColumn(Name = "堆垛机ID", Width = 25)]
        public int? DodeviceId { get; set; }
        /// <summary>
        /// è®¾å¤‡ç±»åž‹
        /// </summary>
        [ExcelColumn(Name = "设备类型", Width = 25)]
        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; }
        /// <summary>
        /// WCS是否可以读取
        /// </summary>
        [ExcelColumn(Name = "WCS是否可以读取", Width = 25)]
        public bool IsRead { get; set; }
        /// <summary>
        /// å¯å˜å˜é‡1
        /// </summary>
        [ExcelColumn(Name = "可变变量1", Width = 25)]
        public string MutableParam1 { get; set; }
        /// <summary>
        /// å¯å˜å˜é‡2
        /// </summary>
        [ExcelColumn(Name = "可变变量2", Width = 25)]
        public string MutableParam2 { get; set; }
        /// <summary>
        /// å¯å˜å˜é‡3
        /// </summary>
        [ExcelColumn(Name = "可变变量3", Width = 25)]
        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; }
    public Dictionary<string, object> GetExportData()
        {
            var exportData = new Dictionary<string, object>();
            foreach (var property in this.GetType().GetProperties())
            {
                exportData.Add(property.Name, property.GetValue(this));
            }
            return exportData;
        }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskUpdateDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
using Volo.Abp.Domain.Entities;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
/// Wms任务管理表更新参数对象
/// </summary>
public class WmsTaskUpdateDto : WmsTaskCreateOrUpdateDtoBase, IHasConcurrencyStamp
{
   /// <summary>
    /// å¹¶å‘戳
    /// </summary>
    public string ConcurrencyStamp { get; set; }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTasksImportModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask
{
    /// <summary>
    /// Wms任务管理表导入模型
    /// </summary>
    public class WmsTasksImportModel
    {
        private List<WmsTaskImportModel> _WmsTasks = new();
        public List<WmsTaskImportModel> WmsTasks
        {
            get => _WmsTasks;
            set
            {
                _WmsTasks = value;
                var rowIndex = 2;
                _WmsTasks?.ForEach(x => x.RowIndex = rowIndex++);
            }
        }
        /// <summary>
        /// Wms任务管理表导入模型
        /// </summary>
        public class WmsTaskImportModel : WmsTaskExportModel
        {
            /// <summary>
            /// è¡Œå·
            /// </summary>
            public int RowIndex { get; set; }
        }
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsTaskAppService.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
using Volo.Abp.Application.Services;
namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
/// <summary>
/// Wms任务管理表应用服务接口
/// </summary>
public interface IWmsTaskAppService : ICrudAppService<WmsTaskDto, Guid, GetWmsTaskInput, WmsTaskCreateDto, WmsTaskUpdateDto>
{
    /// <summary>
    /// å…‹éš†Wms任务管理表
    /// </summary>
    /// <param name="ids"></param>
    /// <returns></returns>
    Task<List<WmsTaskDto>> CloneAsync(IEnumerable<Guid> ids);
    /// <summary>
    /// åˆ é™¤Wms任务管理表
    /// </summary>
    /// <param name="ids"></param>
    /// <returns></returns>
    Task DeleteManyAsync(IEnumerable<Guid> ids);
    /// <summary>
    /// è°ƒæ•´æŽ’序Wms任务管理表
    /// </summary>
    /// <param name="id"></param>
    /// <param name="sort"></param>
    /// <returns></returns>
    Task AdjustSortAsync(Guid id, int sort);
    /// <summary>
    /// å¯¼å…¥Wms任务管理表
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    Task ImportAsync(WmsTasksImportModel input);
    /// <summary>
    /// å¯¼å‡ºWms任务管理表
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsTaskInput input);
}
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsTaskAppService.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,456 @@
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.Shared.Util;
using CMS.Plugin.HIAWms.Domain.WmsTask;
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using Volo.Abp.ObjectMapping;
namespace CMS.Plugin.HIAWms.Application.Implements;
/// <summary>
/// Wms任务管理表应用服务
/// </summary>
public class WmsTaskAppService : CMSPluginAppService, IWmsTaskAppService
{
    private readonly IWmsTaskRepository wmsTaskRepository;
    /// <summary>
    /// Initializes a new instance of the <see cref="WmsTaskAppService"/> class.
    /// </summary>
    /// <param name="WmsTaskRepository">The task job repository.</param>
    public WmsTaskAppService(IWmsTaskRepository _WmsTaskRepository)
    {
        wmsTaskRepository = _WmsTaskRepository;
    }
    /// <summary>
    /// èŽ·å–æŒ‡å®šWms任务管理表
    /// </summary>
    /// <param name="id"></param>
    /// <returns></returns>
    public virtual async Task<WmsTaskDto> GetAsync(Guid id)
    {
        return ObjectMapper.Map<WmsTask, WmsTaskDto>(await wmsTaskRepository.GetAsync(id));
    }
    /// <summary>
    /// åˆ†é¡µèŽ·å–Wms任务管理表
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    public virtual async Task<PagedResultDto<WmsTaskDto>> GetListAsync(GetWmsTaskInput input)
    {
        Check.NotNull(input, nameof(input));
        if (input.Sorting.IsNullOrWhiteSpace())
        {
            input.Sorting = nameof(WmsTask.Sort);
        }
        #region åŠ¨æ€æž„é€ æŸ¥è¯¢æ¡ä»¶
        //动态构造查询条件
        var whereConditions = DynamicGetQueryParams(input);
        #endregion
        var count = await wmsTaskRepository.GetCountAsync(whereConditions);
        var list = await wmsTaskRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
        return new PagedResultDto<WmsTaskDto>(count, ObjectMapper.Map<List<WmsTask>, List<WmsTaskDto>>(list));
    }
    /// <summary>
    /// åŠ¨æ€æž„é€ æŸ¥è¯¢æ¡ä»¶
    /// </summary>
    /// <param name="input">输入参数</param>
    /// <returns></returns>
    private FunReturnResultModel<Expression<Func<WmsTask, bool>>> DynamicGetQueryParams(GetWmsTaskInput input)
    {
        //动态构造查询条件
        var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsTask, GetWmsTaskInput>(input);
        if (!whereConditions.IsSuccess)
        {
            throw new Exception("动态构造查询条件失败:" + whereConditions.ErrMsg);
        }
        //也可再次自定义构建查询条件
        Expression<Func<WmsTask, bool>> extendExpression = a => a.IsDeleted == false;
        // ä½¿ç”¨ System.Linq.PredicateBuilder çš„ And
        var pres = (System.Linq.Expressions.Expression<Func<WmsTask, bool>>)(whereConditions.data);
        whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
        return whereConditions;
    }
    /// <summary>
    /// æ–°å»ºWms任务管理表
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    /// <exception cref="UserFriendlyException"></exception>
    public virtual async Task<WmsTaskDto> CreateAsync(WmsTaskCreateDto input)
    {
        await CheckCreateOrUpdateDtoAsync(input);
        var exist = await wmsTaskRepository.NameExistAsync(input.TaskNo);
        if (exist)
        {
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskNo]);
        }
        var maxSort = await wmsTaskRepository.GetMaxSortAsync();
        var sort = input.Sort ?? maxSort;
        var insertObj = ObjectMapper.Map<WmsTaskCreateDto, WmsTask>(input);
        insertObj.Sort = sort;
        input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
        await wmsTaskRepository.InsertAsync(insertObj);
        if (input.Sort.HasValue && insertObj.Sort != maxSort)
        {
            await AdjustSortAsync(insertObj.Id, insertObj.Sort);
        }
        return ObjectMapper.Map<WmsTask, WmsTaskDto>(insertObj);
    }
    /// <summary>
    /// æ›´æ–°Wms任务管理表
    /// </summary>
    /// <param name="id"></param>
    /// <param name="input"></param>
    /// <returns></returns>
    /// <exception cref="UserFriendlyException"></exception>
    public virtual async Task<WmsTaskDto> UpdateAsync(Guid id, WmsTaskUpdateDto input)
    {
        await CheckCreateOrUpdateDtoAsync(input);
        var updateObj = await wmsTaskRepository.GetAsync(id);
        var exist = await wmsTaskRepository.NameExistAsync(input.TaskNo, updateObj.Id);
        if (exist)
        {
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskNo]);
        }
        updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
                updateObj.Aisle = input.Aisle;
        updateObj.ContainerNo = input.ContainerNo;
        updateObj.DodeviceId = input.DodeviceId;
        updateObj.Dodevicetype = input.Dodevicetype;
        updateObj.IsDisabled = input.IsDisabled;
        updateObj.IsNextTask = input.IsNextTask;
        updateObj.IsRead = input.IsRead;
        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;
        await wmsTaskRepository.UpdateAsync(updateObj);
        return ObjectMapper.Map<WmsTask, WmsTaskDto>(updateObj);
    }
    /// <summary>
    /// å…‹éš†Wms任务管理表
    /// </summary>
    /// <param name="ids"></param>
    /// <returns></returns>
    public async Task<List<WmsTaskDto>> CloneAsync(IEnumerable<Guid> ids)
    {
        //var wmsTasks = new List<WmsTask>();
        //if (ids != null)
        //{
        //    var sort = await wmsTaskRepository.GetMaxSortAsync();
        //    foreach (var id in ids)
        //    {
        //        var WmsTask = await wmsTaskRepository.FindAsync(id);
        //        if (WmsTask != null)
        //        {
        //            var name = WmsTask.Name + WmsTaskConsts.CloneTag;
        //            var notExist = false;
        //            while (!notExist)
        //            {
        //                var exist = await wmsTaskRepository.NameExistAsync(name);
        //                if (exist || wmsTasks.Any(x => x.Name == name))
        //                {
        //                    name += WmsTaskConsts.CloneTag;
        //                    continue;
        //                }
        //                notExist = true;
        //            }
        //            //WmsTask = await wmsTaskRepository.InsertAsync(WmsTask.Clone(GuidGenerator.Create(), name, sort++));
        //            wmsTasks.Add(WmsTask);
        //        }
        //    }
        //}
        //return ObjectMapper.Map<List<WmsTask>, List<WmsTaskDto>>(wmsTasks);
        return new List<WmsTaskDto>();
    }
    /// <summary>
    /// åˆ é™¤å•个Wms任务管理表
    /// </summary>
    /// <param name="id"></param>
    /// <returns></returns>
    public virtual Task DeleteAsync(Guid id)
    {
        return wmsTaskRepository.DeleteAsync(id);
    }
    /// <summary>
    /// åˆ é™¤å¤šä¸ªWms任务管理表
    /// </summary>
    /// <param name="ids"></param>
    /// <returns></returns>
    public async Task DeleteManyAsync(IEnumerable<Guid> ids)
    {
        foreach (var id in ids)
        {
            await DeleteAsync(id);
        }
    }
    /// <summary>
    /// è°ƒæ•´æŽ’序Wms任务管理表
    /// </summary>
    /// <param name="id"></param>
    /// <param name="sort"></param>
    /// <returns></returns>
    public virtual async Task AdjustSortAsync(Guid id, int sort)
    {
        var list = await wmsTaskRepository.GetListAsync(null, nameof(WmsTask.Sort));
        if (list != null && list.Any())
        {
            var initSort = 1;
            list.ForEach(x => x.AdjustSort(initSort++));
            var entity = list.FirstOrDefault(x => x.Id == id);
            if (entity != null)
            {
                if (sort == 1)
                {
                    list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
                }
                else if (entity.Sort > sort)
                {
                    list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
                    list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
                }
                else if (entity.Sort < sort)
                {
                    list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
                    list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
                }
                entity.AdjustSort(sort);
            }
        }
        await wmsTaskRepository.UpdateManyAsync(list);
    }
    /// <summary>
    /// å¯¼å…¥Wms任务管理表
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    /// <exception cref="UserFriendlyException"></exception>
    public async Task ImportAsync(WmsTasksImportModel input)
    {
        Check.NotNull(input, nameof(input));
        var wmsTaskCreateDtos = new List<(int RowIndex, WmsTaskCreateDto Item)>();
        var wmsTaskUpdateDtos = new List<(int RowIndex, Guid Id, WmsTaskUpdateDto Item)>();
        var importItems = input.WmsTasks;
        if (importItems != null && importItems.Any())
        {
            #region å¯¼å…¥æ ¡éªŒ
            // åˆ¤æ–­åç§°æ˜¯å¦é‡å¤ï¼Œå¹¶è¾“出第几行重复
            var duplicateWmsTasks = importItems.GroupBy(x => x.TaskNo).Where(x => x.Count() > 1).ToList();
            if (duplicateWmsTasks?.Any() == true)
            {
                var duplicateWmsTaskMsgs = duplicateWmsTasks.Select(x => $"第 {string.Join(",", x.Select(x => x.RowIndex))} è¡Œï¼š{x.Key}  åç§°é‡å¤");
                var errorMsg = $"导入失败!配置, {string.Join(",", duplicateWmsTaskMsgs)},终止导入";
                throw new UserFriendlyException(errorMsg);
            }
            #endregion
            foreach (var impItem in importItems)
            {
                if (impItem.TaskNo.IsNullOrWhiteSpace())
                {
                    continue;
                }
                if (impItem.TaskNo.IsNullOrWhiteSpace())
                {
                    var errorMsg = $"导入失败!配置,第{impItem.RowIndex}行:WmsTask名称不能为空";
                    throw new UserFriendlyException(errorMsg);
                }
                var oldWmsTask = await wmsTaskRepository.FindByNameAsync(impItem.TaskNo);
                if (oldWmsTask != null)
                {
                    var wmsTaskUpdateDto = new WmsTaskUpdateDto
                    {
                        Aisle = impItem.Aisle,
ContainerNo = impItem.ContainerNo,
DodeviceId = impItem.DodeviceId,
Dodevicetype = impItem.Dodevicetype,
IsDisabled = impItem.IsDisabled,
IsNextTask = impItem.IsNextTask,
IsRead = impItem.IsRead,
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,
                    };
                    wmsTaskUpdateDtos.Add((impItem.RowIndex, oldWmsTask.Id, wmsTaskUpdateDto));
                }
                else
                {
                    var wmsTaskCreateDto = new WmsTaskCreateDto
                    {
                        Aisle = impItem.Aisle,
ContainerNo = impItem.ContainerNo,
DodeviceId = impItem.DodeviceId,
Dodevicetype = impItem.Dodevicetype,
IsDisabled = impItem.IsDisabled,
IsNextTask = impItem.IsNextTask,
IsRead = impItem.IsRead,
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,
                    };
                    wmsTaskCreateDtos.Add((impItem.RowIndex, wmsTaskCreateDto));
                }
            }
        }
        // æ–°å¢ž
        foreach (var wmsTaskDto in wmsTaskCreateDtos)
        {
            try
            {
                await CreateAsync(wmsTaskDto.Item);
            }
            catch (Exception e)
            {
                var errorMsg = $"导入失败!配置,第{wmsTaskDto.RowIndex}行:{e.Message},终止导入";
                throw new UserFriendlyException(errorMsg);
            }
        }
        // æ›´æ–°
        foreach (var wmsTaskDto in wmsTaskUpdateDtos)
        {
            try
            {
                await UpdateAsync(wmsTaskDto.Id, wmsTaskDto.Item);
            }
            catch (Exception e)
            {
                var errorMsg = $"导入失败!配置,第{wmsTaskDto.RowIndex}行:{e.Message},终止导入";
                throw new UserFriendlyException(errorMsg);
            }
        }
    }
    /// <summary>
    /// å¯¼å‡ºWms任务管理表
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsTaskInput input)
    {
        Check.NotNull(input, nameof(input));
        if (input.Sorting.IsNullOrWhiteSpace())
        {
            input.Sorting = nameof(WmsTask.Sort);
        }
        #region åŠ¨æ€æž„é€ æŸ¥è¯¢æ¡ä»¶
        //动态构造查询条件
        var whereConditions = DynamicGetQueryParams(input);
        #endregion
        var list = await wmsTaskRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
        var result = ObjectMapper.Map<List<WmsTask>, List<WmsTaskDto>>(list);
        var sheets = new Dictionary<string, object>
        {
            ["配置"] = ExportHelper.ConvertListToExportData(result),
        };
        var fileName = result.Count > 1 ? "Wms任务管理表列表" : result.Count == 1 ? result[0]?.TaskNo : "WmsTask模版";
        return (sheets, fileName);
    }
    /// <summary>
    /// æ ¡éªŒ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, "任务类型");
        return Task.CompletedTask;
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsTaskAutoMapperProfile.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
using CMS.Plugin.HIAWms.Domain.WmsTask;
using Volo.Abp.ObjectExtending;
namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
/// <summary>
/// Wms任务管理表AutoMapper配置
/// </summary>
/// <seealso cref="AutoMapper.Profile" />
public class WmsTaskAutoMapperProfile : Profile
{
    /// <summary>
    /// Initializes a new instance of the <see cref="WmsTaskAutoMapperProfile"/> class.
    /// </summary>
    public WmsTaskAutoMapperProfile()
    {
        /* You can configure your AutoMapper mapping configuration here.
         * Alternatively, you can split your mapping configurations
         * into multiple profile classes for a better organization. */
        CreateMap<WmsTask, WmsTaskDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<WmsTaskCreateDto, WmsTask>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsTaskInput, WmsTask>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsTask/IWmsTaskRepository.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;
using Volo.Abp.Domain.Repositories;
namespace CMS.Plugin.HIAWms.Domain.WmsTask;
/// <summary>
/// Wms任务管理表仓储
/// </summary>
public interface IWmsTaskRepository : IBasicRepository<WmsTask, Guid>
{
    /// <summary>
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾Wms任务管理表
    /// </summary>
    /// <param name="name"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    Task<WmsTask> FindByNameAsync(string name, CancellationToken cancellationToken = default);
    /// <summary>
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨Wms任务管理表
    /// </summary>
    /// <param name="name"></param>
    /// <param name="id"></param>
    /// <returns></returns>
    Task<bool> NameExistAsync(string name, Guid? id = null);
    /// <summary>
    /// èŽ·å–æœ€å¤§æŽ’åºWms任务管理表
    /// </summary>
    /// <returns></returns>
    Task<int> GetMaxSortAsync();
    /// <summary>
    /// èŽ·å–åˆ†é¡µåˆ—è¡¨Wms任务管理表
    /// </summary>
    /// <param name="whereConditions"></param>
    /// <param name="sorting"></param>
    /// <param name="maxResultCount"></param>
    /// <param name="skipCount"></param>
    /// <param name="includeDetails"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    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任务管理表
    /// </summary>
    /// <param name="whereConditions"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsTask, bool>>> whereConditions, CancellationToken cancellationToken = default);
}
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsTaskRepository.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,113 @@
using CMS.Plugin.HIAWms.Domain.WmsTask;
using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
using CmsQueryExtensions.Extension;
using Microsoft.EntityFrameworkCore;
using System.Linq.Dynamic.Core;
using System.Linq.Expressions;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
/// <summary>
/// Wms任务管理表仓储实现
/// </summary>
public class EfCoreWmsTaskRepository : EfCoreRepository<ICMSPluginDbContext, WmsTask, Guid>, IWmsTaskRepository
{
    /// <summary>
    /// Initializes a new instance of the <see cref="EfCoreWmsTaskRepository"/> class.
    /// </summary>
    /// <param name="dbContextProvider">The database context provider.</param>
    public EfCoreWmsTaskRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
        : base(dbContextProvider)
    {
    }
    /// <summary>
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾Wms任务管理表
    /// </summary>
    /// <param name="name"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public virtual async Task<WmsTask> FindByNameAsync(string name, CancellationToken cancellationToken = default)
    {
        return await (await GetDbSetAsync())
            .IncludeDetails()
            .Where(x => !x.IsDeleted)
            .OrderBy(t => t.Sort)
            .FirstOrDefaultAsync(t => t.TaskNo == name, GetCancellationToken(cancellationToken));
    }
    /// <summary>
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨Wms任务管理表
    /// </summary>
    /// <param name="name">校验值</param>
    /// <param name="id"></param>
    /// <returns></returns>
    public async Task<bool> NameExistAsync(string name, Guid? id = null)
    {
        return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.TaskNo == name);
    }
    /// <summary>
    /// èŽ·å–æœ€å¤§æŽ’åºWms任务管理表
    /// </summary>
    /// <returns></returns>
    public async Task<int> GetMaxSortAsync()
    {
        var hasAny = await (await GetQueryableAsync())
            .Where(x => !x.IsDeleted).AnyAsync();
        if (!hasAny)
        {
            return 1;
        }
        var sort = await (await GetQueryableAsync())
            .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
        return sort + 1;
    }
    /// <summary>
    /// èŽ·å–åˆ†é¡µåˆ—è¡¨Wms任务管理表
    /// </summary>
    /// <param name="whereConditions"></param>
    /// <param name="sorting"></param>
    /// <param name="maxResultCount"></param>
    /// <param name="skipCount"></param>
    /// <param name="includeDetails"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public async 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)
    {
        return await (await GetDbSetAsync())
            .IncludeDetails(includeDetails)
            .WhereIf(whereConditions != null, whereConditions.data)
            .Where(x => !x.IsDeleted)
            .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsTask.Sort) : sorting)
            .PageBy(skipCount, maxResultCount)
            .ToListAsync(GetCancellationToken(cancellationToken));
    }
    /// <summary>
    /// èŽ·å–æ€»æ•°Wms任务管理表
    /// </summary>
    /// <param name="whereConditions"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsTask, bool>>> whereConditions, CancellationToken cancellationToken = default)
    {
        return await (await GetQueryableAsync())
            .WhereIf(whereConditions != null, whereConditions.data)
            .Where(x => !x.IsDeleted)
            .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
    }
    /// <inheritdoc />
    public override async Task<IQueryable<WmsTask>> WithDetailsAsync()
    {
        return (await GetQueryableAsync())
            .Where(x => !x.IsDeleted).IncludeDetails();
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,188 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using MiniExcelLibs;
using System.Reflection;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.HIAWms.Controller
{
    /// <summary>
    /// Wms任务管理表服务
    /// </summary>
    [ApiController]
    [TypeFilter(typeof(CMSLanguageFilter))]
    [TypeFilter(typeof(CMSUowActionFilter))]
    [TypeFilter(typeof(CMSAuditActionFilter))]
    [TypeFilter(typeof(CMSExceptionFilter))]
    [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
    public class WmsTaskController : ControllerBase
    {
        private readonly IWmsTaskAppService _wmsTaskAppService;
        /// <summary>
        /// Initializes a new instance of the <see cref="WmsTaskController"/> class.
        /// </summary>
        /// <param name="wmsTaskAppService">The wmsTask application service.</param>
        public WmsTaskController(IWmsTaskAppService wmsTaskAppService)
        {
            _wmsTaskAppService = wmsTaskAppService;
        }
        /// <summary>
        /// èŽ·å–Wms任务管理表
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
        [HttpGet]
        [Route("{id}")]
        public virtual Task<WmsTaskDto> GetAsync(Guid id)
        {
            return _wmsTaskAppService.GetAsync(id);
        }
        /// <summary>
        /// åˆ†é¡µèŽ·å–Wms任务管理表的列表.
        /// </summary>
        /// <param name="input">输入.</param>
        /// <returns></returns>
        [HttpGet]
        [Route("Page")]
        public virtual Task<PagedResultDto<WmsTaskDto>> GetListAsync([FromQuery] GetWmsTaskInput input)
        {
            return _wmsTaskAppService.GetListAsync(input);
        }
        /// <summary>
        /// åˆ›å»ºWms任务管理表
        /// </summary>
        /// <param name="input">输入.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpPost]
        public virtual Task<WmsTaskDto> CreateAsync(WmsTaskCreateDto input)
        {
            return _wmsTaskAppService.CreateAsync(input);
        }
        /// <summary>
        /// æ›´æ–°Wms任务管理表
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <param name="input">输入.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpPut]
        [Route("{id}")]
        public virtual Task<WmsTaskDto> UpdateAsync(Guid id, WmsTaskUpdateDto input)
        {
            return _wmsTaskAppService.UpdateAsync(id, input);
        }
        /// <summary>
        /// å…‹éš†Wms任务管理表
        /// </summary>
        /// <param name="ids">Id集合.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpPost]
        [Route("Clone")]
        public virtual Task<List<WmsTaskDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
        {
            return _wmsTaskAppService.CloneAsync(ids);
        }
        /// <summary>
        /// åˆ é™¤Wms任务管理表
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpDelete]
        [Route("{id}")]
        public virtual Task DeleteAsync(Guid id)
        {
            return _wmsTaskAppService.DeleteAsync(id);
        }
        /// <summary>
        /// æ‰¹é‡åˆ é™¤Wms任务管理表
        /// </summary>
        /// <param name="ids">The ids.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpDelete]
        public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
        {
            return _wmsTaskAppService.DeleteManyAsync(ids);
        }
        /// <summary>
        /// è°ƒæ•´æŽ’序Wms任务管理表
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
        [HttpPut]
        [Route("{id}/AdjustSort/{sort}")]
        public virtual Task AdjustSortAsync(Guid id, int sort)
        {
            return _wmsTaskAppService.AdjustSortAsync(id, sort);
        }
        /// <summary>
        /// å¯¼å…¥Wms任务管理表
        /// </summary>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        [Route("Import")]
        public virtual async Task<IActionResult> ImportAsync(IFormFile file)
        {
            using var stream = new MemoryStream();
            await file.CopyToAsync(stream);
            stream.Seek(0L, SeekOrigin.Begin);
            var sheetNames = stream.GetSheetNames();
            var wmsTaskRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsTasksImportModel.WmsTaskImportModel>(stream, sheetName: "配置").ToList() : new();
            if (!wmsTaskRows.Any())
            {
                throw new UserFriendlyException("请检查导入的表格");
            }
            await _wmsTaskAppService.ImportAsync(new WmsTasksImportModel
            {
                WmsTasks = wmsTaskRows,
            });
            return Ok();
        }
        /// <summary>
        /// å¯¼å‡ºWms任务管理表
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [Route("Export")]
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsTaskInput input)
        {
            input.MaxResultCount = int.MaxValue;
            var exportData = await _wmsTaskAppService.ExportAsync(input);
            var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsTask导出模板.xlsx");
            if (!System.IO.File.Exists(templatePath))
            {
                templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsTask导出模板.xlsx");
            }
            var memoryStream = new MemoryStream();
            await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
            memoryStream.Seek(0L, SeekOrigin.Begin);
            return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
        }
    }
}
HIAWms/web/src/config/menu.ts
@@ -1,5 +1,12 @@
export const menu: Record<string,any>[] = [
  {
    "name": "Wms任务管理",
    "path": "/information-base/WmsTask",
    "patchName": "WmsTask",
    "icon": "p",
    "notPage": false
  },
  {
    "name": "仓库信息",
    "path": "/information-base/WmsStoreInfo",
    "patchName": "WmsStoreInfo",
@@ -7,16 +14,16 @@
    "notPage": false
  },
  {
    "name": "库存信息",
    "path": "/information-base/WmsMaterialStock",
    "patchName": "WmsMaterialStock",
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
    "patchName": "WmsInOutStockRecord",
    "icon": "p",
    "notPage": false
  },
  {
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
    "patchName": "WmsInOutStockRecord",
    "name": "库存信息",
    "path": "/information-base/WmsMaterialStock",
    "patchName": "WmsMaterialStock",
    "icon": "p",
    "notPage": false
  },
@@ -43,6 +50,13 @@
  }
];
export const menuMap: Record<string,any> = {
  "WmsTask": {
    "name": "Wms任务管理",
    "path": "/information-base/WmsTask",
    "patchName": "WmsTask",
    "icon": "p",
    "notPage": false
  },
  "WmsStoreInfo": {
    "name": "仓库信息",
    "path": "/information-base/WmsStoreInfo",
@@ -50,13 +64,6 @@
    "icon": "p",
    "notPage": false
  },
  "WmsMaterialStock": {
    "name": "库存信息",
    "path": "/information-base/WmsMaterialStock",
    "patchName": "WmsMaterialStock",
    "icon": "p",
    "notPage": false
  },
  "WmsInOutStockRecord": {
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
@@ -64,6 +71,13 @@
    "icon": "p",
    "notPage": false
  },
  "WmsMaterialStock": {
    "name": "库存信息",
    "path": "/information-base/WmsMaterialStock",
    "patchName": "WmsMaterialStock",
    "icon": "p",
    "notPage": false
  },
  "WmsContainer": {
    "name": "Wms托盘管理",
    "path": "/information-base/WmsContainer",
HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/Config.ts
@@ -1,63 +1,59 @@
export const columns = [
  {
    type: 'seq',
    width: 60,
    title: '序号',
  },
  {
  field: 'orderNo',
  title: '单据编号',
},
{
  field: 'materialName',
  title: '物料名称',
},
{
  field: 'materialNo',
  title: '物料件号',
},
{
  field: 'stockTypeDesc',
  title: '操作类型',
},
{
  field: 'containerNo',
  title: '容器编号',
},
{
  field: 'materialModel',
  title: '机型',
},
{
  field: 'operateTime',
  title: '操作时间',
},
{
  field: 'remark',
  title: '备注',
},
{
  field: 'materialId',
  title: '物料ID',
},
{
  field: 'taskNo',
  title: '任务号',
},
{
  field: 'sourcePlace',
  title: '起始库位',
},
{
  field: 'toPlace',
  title: '目标库位',
},
{
  field: 'creationTime',
  title: '',
},
{
  field: 'deletionTime',
  title: '',
},
]
export const columns = [
  {
    type: 'seq',
    width: 60,
    title: '序号',
  },
  {
    field: 'orderNo',
    title: '单据编号',
  },
  {
    field: 'materialName',
    title: '物料名称',
  },
  {
    field: 'materialNo',
    title: '物料件号',
  },
  {
    field: 'stockTypeDesc',
    title: '操作类型',
  },
  {
    field: 'containerNo',
    title: '容器编号',
  },
  {
    field: 'materialModel',
    title: '机型',
  },
  {
    field: 'operateTime',
    title: '操作时间',
  },
  {
    field: 'remark',
    title: '备注',
  },
  {
    field: 'materialId',
    title: '物料ID',
  },
  {
    field: 'taskNo',
    title: '任务号',
  },
  {
    field: 'sourcePlace',
    title: '起始库位',
  },
  {
    field: 'toPlace',
    title: '目标库位',
  },
  // {
  //   field: 'deletionTime',
  //   title: '',
  // },
]
HIAWms/web/src/widgets/WmsTask/Controllers/File.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
import { importFileToService, exportFileToClient } from '@/api/file'
import { ElMessage } from 'element-plus'
import { downloadFile } from '@/utils'
import dayjs from 'dayjs'
export const useFile = () => {
  /**
   * å¯¼å…¥æ–‡ä»¶
   * @param url
   */
  const importFile = async (url: string, file: File) => {
    const formData = new FormData()
    formData.append('file', file)
    await importFileToService(url, formData)
    ElMessage('导入成功')
  }
  /**
   * å¯¼å‡ºæ–‡ä»¶
   * @param url
   */
  const exportFile = async (url: string, params: any, name: string) => {
    const res = await exportFileToClient(url, params)
    downloadFile(res, `${name}_${dayjs().format('YYYYMMDDHHMMss')}.xlsx`)
    ElMessage.success('导出成功')
  }
  return {
    importFile,
    exportFile,
  }
}
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTask.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,275 @@
import { ref, onMounted, reactive, Ref, nextTick, computed } from 'vue'
import { injectModel } from '@/libs/Provider/Provider'
import { WmsTask } from '../Models/WmsTask'
import { ElMessage } from 'element-plus'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { useFile } from './File'
interface CurrentType {
  row: any
  index: number
}
export const useWmsTask = (props: any, ctx?: any) => {
  const wmsTask = injectModel<WmsTask>('wmsTask')
  const { exportFile } = useFile()
  /**
   * å¤´éƒ¨é…ç½®
   */
  const headers = ref({})
  /**
   * åŠ¨æ€åˆ—é…ç½®
   */
  const wmsTaskColumns = ref<Record<string, any>>([])
  /**
   * æœç´¢å€¼
   */
  const search = ref('')
  /**
   * æŽ’序
   */
  const sort = ref(0)
  /**
   * é€‰æ‹©é¡¹
   */
  const selection = ref([])
  /**
   * å½“前选中的行
   */
  const current = ref<any>(null)
  /**
   * æ•°æ®æº
   */
  const dataSource: Ref<any[]> = ref([])
  /**
   * è¡¨æ ¼
   */
  const tableRef = ref()
  const dialogConfig = reactive({
    visible: false,
    title: '',
    isAdd: false,
  })
  const dialogConfigForQuery = reactive({
    visible: false,
    title: '',
    isAdd: false,
  })
  const dialogSettingConfig = reactive({
    visible: false,
    title: '',
  })
  /**
   * åˆ†é¡µæ•°æ®
   */
  const paginationParams = ref({})
  /**
   * æ‰“开详情
   * @param row
   */
  const openDetail = (row: any) => {
    current.value = row
    dialogConfig.visible = true
    dialogConfig.title = row.name
    dialogConfig.isAdd = false
    sort.value = row.sort
  }
  const contextMenu = [
    {
      label: '展开详情',
      fn: (c: CurrentType) => {
        current.value = null
        sort.value = c.row.sort
        nextTick(() => openDetail(c.row))
      },
      divided: true,
      icon: 'o',
    },
    // {
    //   label: '向上添加',
    //   fn: (c: CurrentType, pageNum: number) => {
    //     current.value = null
    //     sort.value = c.index + 1 + (pageNum - 1) * 50
    //     dialogConfig.visible = true
    //     dialogConfig.title = '添加'
    //     dialogConfig.isAdd = false
    //   },
    //   divided: true,
    //   icon: 'up',
    // },
    // {
    //   label: '向下添加',
    //   fn: (c: CurrentType, pageNum: number) => {
    //     current.value = null
    //     sort.value = c.index + 2 + (pageNum - 1) * 50
    //     dialogConfig.visible = true
    //     dialogConfig.title = '添加'
    //     dialogConfig.isAdd = false
    //   },
    //   divided: true,
    //   icon: 'down',
    // },
    // {
    //   label: '创建副本',
    //   fn: async ({ row }: CurrentType) => {
    //     await wmsTask.cloneData([row.id])
    //     ElMessage.success('创建副本成功')
    //     tableRef.value?.getList()
    //   },
    //   divided: true,
    //   icon: 'copy',
    // },
    {
      label: '删除',
      fn: async (c: CurrentType) => {
        const names = selection.value.map((item: { taskNo: string }) => item.taskNo)
        ConfirmBox(
          `是否删除${names.length ? names.join(',') : c.row.taskNo}`
        ).then(async () => {
          const ids = selection.value.map((item: { id: string }) => item.id)
          await wmsTask.deleteWmsTasks(ids.length ? ids : [c.row.id])
          ElMessage.success('删除成功')
          tableRef.value.getList()
        })
      },
      icon: 'close',
    },
  ]
  const onCheck = (records: any) => {
    selection.value = records
  }
  const onAddWmsTask = () => {
    const params = tableRef.value?.getPaginationParams()
    current.value = null
    dialogConfig.visible = true
    dialogConfig.isAdd = true
    dialogConfig.title = '添加'
    sort.value = params.totalCount + 1
  }
  //点击按钮【高级查询】
  const onAdvancedQuery = () => {
    const params = tableRef.value?.getPaginationParams()
    current.value = null
    dialogConfigForQuery.visible = true
    dialogConfigForQuery.isAdd = true
    dialogConfigForQuery.title = '高级查询'
  }
  const onConfirmWmsTask = async () => {
    dialogConfig.visible = false
    if (dialogConfig.isAdd) {
      tableRef.value?.scrollToRow({
        skip: true,
      })
    } else {
      await tableRef.value?.getList()
    }
  }
  /**
   * è¡Œç‚¹å‡»æ—¶æ›´æ–°current
   */
  const onRowClick = ({ row }: any) => {
    if (dialogConfig.visible && current.value) {
      current.value = row
    }
  }
  /**
   * å¯¼å‡º
   */
  const onExport = (data={}) => {
    //const params = tableRef.value?.getParams()
    exportFile('/api/v1/HIAWms/wmsTask/export', data, 'HIAWms')
  }
  /**
   * å…³é”®å­—搜索
   */
  const onSearch = () => {
    tableRef.value?.getList({
      Filter: search.value,
    })
  }
  /**
   * é‡ç½®è¡¨æ ¼æ•°æ®
   */
  const reloadList = () => {
    tableRef.value?.getList()
  }
  /**
   * ä¸Šä¼ æˆåŠŸ
   */
  const onSuccess = () => {
    tableRef.value?.getList()
    ElMessage.success('导入成功')
  }
  /**
   * å¤±è´¥
   * @param err
   */
  const onError = (err: any) => {
    try {
      const message = JSON.parse(err.message)
      ElMessage.error(message.msg)
    } catch (error) {
      ElMessage.error('导入失败')
    }
  }
  /**
   * ä¸Šä¼ é’©å­
   */
  const onBeforeUpload = (file: File) => {
    const format = ['xlsx', 'xls', 'csv']
    if (!format.includes(file.name.split('.')[1])) {
      ElMessage.error('导入文件格式不正确,请导入.xlsx/.xls与.csv格式的文件')
      return false
    }
    return true
  }
  onMounted(() => {
    headers.value = {
      Authorization: `Bearer ${sessionStorage.getItem('Token')}`,
      'X-Project': sessionStorage.getItem('X-Project'),
    }
  })
  ctx.expose({
    reloadList,
  })
  return {
    dataSource,
    contextMenu,
    dialogConfig,
    dialogConfigForQuery,
    dialogSettingConfig,
    tableRef,
    current,
    search,
    sort,
    wmsTaskColumns,
    paginationParams,
    headers,
    onBeforeUpload,
    onError,
    onSuccess,
    openDetail,
    onSearch,
    onExport,
    onRowClick,
    onConfirmWmsTask,
    onCheck,
    onAddWmsTask,
    onAdvancedQuery
  }
}
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,332 @@
import {
  ref,
  onMounted,
  reactive,
  computed,
  Ref,
  watch,
  SetupContext,
  h,
} from 'vue'
import { injectModel } from '@/libs/Provider/Provider'
import { WmsTaskDrawer } from '../Models/WmsTaskDrawer'
import { ElMessage } from 'element-plus'
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
export const useWmsTaskDrawer = (props: any, ctx?: any) => {
  const wmsTaskDrawer = injectModel<WmsTaskDrawer>('wmsTaskDrawer')
  /**
   * ç”¨æ¥å¯¹æ¯”的初始化数据
   */
  const initiateData: Ref<Record<string, any>> = ref({})
  const formData = ref<Record<string, any>>({})
  // ref
  const formRef = ref()
  const disabled = ref(false)
  const current = computed(() => {
    return props.row || null
  })
  const inputNumber = (attrs) => {
    return (
      <el-input-number
        min="1"
        step="1"
        precision="0"
        {...attrs}
      ></el-input-number>
    )
  }
  const visible = computed({
    get() {
      return props.modelValue
    },
    set(val) {
      ctx.emit('update:modelValue', val)
    },
  })
  /**
   * æ·»åŠ çš„form字段
   */
  const formItems = reactive([
                    {
                   label: '巷道',
                   prop: 'aisle',
                   //disabled: disabled,
                   placeholder: '请输入巷道',
                },
                {
                   label: '托盘编号',
                   prop: 'containerNo',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入托盘编号',
                },
                {
                   label: '堆垛机ID',
                   prop: 'dodeviceId',
                   //disabled: disabled,
                   placeholder: '请输入堆垛机ID',
                },
                {
                   label: '设备类型',
                   prop: 'dodevicetype',
                   //disabled: disabled,
                   placeholder: '请输入设备类型',
              rules: [{required: true, message: '设备类型不能为空', trigger: 'blur' }],
                },
                {
                   label: '下个任务是否生成成功',
                   prop: 'isNextTask',
                   //disabled: disabled,
                   placeholder: '请输入下个任务是否生成成功',
                },
                {
                   label: 'WCS是否可以读取',
                   prop: 'isRead',
                   el: 'select',
                   //disabled: disabled,
                   placeholder: '请输入WCS是否可以读取',
              rules: [{required: true, message: 'WCS是否可以读取不能为空', trigger: 'blur' }],
                },
                {
                   label: '可变变量1',
                   prop: 'mutableParam1',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入可变变量1',
                },
                {
                   label: '可变变量2',
                   prop: 'mutableParam2',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入可变变量2',
                },
                {
                   label: '可变变量3',
                   prop: 'mutableParam3',
                   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: '请输入目标库位',
                },
  ])
  /**
   * æ ¡éªŒæ˜¯å¦æœ‰æ•°æ®å˜åŒ–
   */
  const checkIsEqualObject = () => {
    const data = {
      formData: formData.value,
    }
    const check = isEqual(initiateData.value, data)
    return check
  }
  const onClose = (done: () => void) => {
    if (visible.value) {
      if (checkIsEqualObject()) {
        visible.value = false
        done && done()
      } else {
        ConfirmBox('是否保存设置?')
          .then(() => {
            onConfirm()
          })
          .catch(() => {
            visible.value = false
            done && done()
          })
      }
    }
  }
  /**
   * ä¿å­˜
   */
  const onConfirm = async () => {
    await formRef.value?.validate()
    const data = {
      aisle: formData.value.aisle,
containerNo: formData.value.containerNo,
dodeviceId: formData.value.dodeviceId,
dodevicetype: formData.value.dodevicetype,
isNextTask: formData.value.isNextTask,
isRead: formData.value.isRead,
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)
    } else {
      const id = current.value.id
      await wmsTaskDrawer.updateWmsTask(id, data)
    }
    ElMessage.success('保存成功')
    ctx.emit('confirm')
  }
  const updateCheckData = () => {
    initiateData.value = {
      formData: {
        ...formData.value,
      },
    }
  }
  const updateFormItemOptions = (propName: string, enumData: any[]) => {
    const item = formItems.find((item) => item.prop === propName)
    if (item && enumData) {
      item.options = enumData.map((item) => ({
        label: item.description,
        value: item.value,
      }))
    }
  }
  /**
   * é€šç”¨æŸ¥è¯¢æžšä¸¾
   */
  const commonQueryEnumForFrom = async () => {
    const taskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({
 EnumName: 'TaskTypeEnum',
})
updateFormItemOptions('taskType', taskTypeEnumEnum)
const wmsTaskStatusEnum = await wmsTaskDrawer.getWmsEnumData({
 EnumName: 'WmsTaskStatus',
})
updateFormItemOptions('taskStatus', wmsTaskStatusEnum)
const sonTaskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({
 EnumName: 'SonTaskTypeEnum',
})
updateFormItemOptions('sonTaskType', sonTaskTypeEnumEnum)
  }
  commonQueryEnumForFrom()
  /**
   * å¼¹çª—打开获取详情
   */
  const onOpen = async () => {
    if (current.value) {
      const res = await wmsTaskDrawer.getWmsTaskDetail(current.value)
      formData.value = {
        aisle: res.aisle,
containerNo: res.containerNo,
dodeviceId: res.dodeviceId,
dodevicetype: res.dodevicetype,
isNextTask: res.isNextTask,
isRead: res.isRead,
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
      updateCheckData()
    } else {
      formData.value = {}
      disabled.value = false
      updateCheckData()
    }
  }
  watch(() => current.value, onOpen)
  return {
    formItems,
    formData,
    visible,
    formRef,
    onOpen,
    onClose,
    onConfirm,
  }
}
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,308 @@
import {
  ref,
  onMounted,
  reactive,
  computed,
  Ref,
  watch,
  SetupContext,
  h,
} from 'vue'
import { injectModel } from '@/libs/Provider/Provider'
import { WmsTaskDrawer } from '../Models/WmsTaskDrawer'
import { ElMessage } from 'element-plus'
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
export const useWmsTaskQueryDrawer = (props: any, ctx?: any) => {
  const wmsTaskDrawer = injectModel<WmsTaskDrawer>('WmsTaskDrawer')
  /**
   * ç”¨æ¥å¯¹æ¯”的初始化数据
   */
  const initiateData: Ref<Record<string, any>> = ref({})
  const formData = ref<Record<string, any>>({})
  // ref
  const formRef = ref()
  const disabled = ref(false)
  const current = computed(() => {
    return props.row || null
  })
  const inputNumber = (attrs) => {
    return (
      <el-input-number
        min="1"
        step="1"
        precision="0"
        {...attrs}
      ></el-input-number>
    )
  }
  const visible = computed({
    get() {
      return props.modelValue
    },
    set(val) {
      ctx.emit('update:modelValue', val)
    },
  })
  /**
   * æ·»åŠ çš„form字段
   */
  const formItems = reactive([
                    {
                   label: '巷道',
                   prop: 'aisle',
                   //disabled: disabled,
                   placeholder: '请输入巷道',
                },
                {
                   label: '托盘编号',
                   prop: 'containerNo',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入托盘编号',
                },
                {
                   label: '堆垛机ID',
                   prop: 'dodeviceId',
                   //disabled: disabled,
                   placeholder: '请输入堆垛机ID',
                },
                {
                   label: '设备类型',
                   prop: 'dodevicetype',
                   //disabled: disabled,
                   placeholder: '请输入设备类型',
                },
                {
                   label: '下个任务是否生成成功',
                   prop: 'isNextTask',
                   //disabled: disabled,
                   placeholder: '请输入下个任务是否生成成功',
                },
                {
                   label: 'WCS是否可以读取',
                   prop: 'isRead',
                   el: 'select',
                   //disabled: disabled,
                   placeholder: '请输入WCS是否可以读取',
                },
                {
                   label: '可变变量1',
                   prop: 'mutableParam1',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入可变变量1',
                },
                {
                   label: '可变变量2',
                   prop: 'mutableParam2',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入可变变量2',
                },
                {
                   label: '可变变量3',
                   prop: 'mutableParam3',
                   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: '请输入设备任务状态',
                },
                {
                   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: '请输入目标库位',
                },
  ])
  /**
   * æ ¡éªŒæ˜¯å¦æœ‰æ•°æ®å˜åŒ–
   */
  const checkIsEqualObject = () => {
    const data = {
      formData: formData.value,
    }
    const check = isEqual(initiateData.value, data)
    return check
  }
  const commonGetFormData=()=>{
    const data = {
      Aisle: formData.value.Aisle,
ContainerNo: formData.value.ContainerNo,
DodeviceId: formData.value.DodeviceId,
Dodevicetype: formData.value.Dodevicetype,
IsNextTask: formData.value.IsNextTask,
IsRead: formData.value.IsRead,
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,
    }
    return data;
  }
  const onClose = (done: () => void) => {
    if (visible.value) {
      visible.value = false
      const data =commonGetFormData();
      ctx.emit('close', data)
    }
  }
  /**
   * ç¡®è®¤æŸ¥è¯¢
   */
  const onConfirmQuery = async () => {
    const data =commonGetFormData();
    ctx.emit('confirmQuery', data)
  }
  /**
   * é‡ç½®æŸ¥è¯¢
   */
  const onReset = async () => {
    formData.value = {}
    formData.value.Aisle = ''
formData.value.ContainerNo = ''
formData.value.DodeviceId = ''
formData.value.Dodevicetype = ''
formData.value.IsNextTask = ''
formData.value.IsRead = ''
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 = ''
    //向父组件发送自定义事件
    ctx.emit('restQuery');
  }
  const updateCheckData = () => {
    initiateData.value = {
      formData: {
        ...formData.value,
      },
    }
  }
  const updateFormItemOptions = (propName: string, enumData: any[]) => {
    const item = formItems.find((item) => item.prop === propName)
    if (item && enumData) {
      item.options = enumData.map((item) => ({
        label: item.description,
        value: item.value,
      }))
    }
  }
  /**
   * é€šç”¨æŸ¥è¯¢æžšä¸¾
   */
  const commonQueryEnumForFrom = async () => {
    const taskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({
 EnumName: 'TaskTypeEnum',
})
updateFormItemOptions('taskType', taskTypeEnumEnum)
const wmsTaskStatusEnum = await wmsTaskDrawer.getWmsEnumData({
 EnumName: 'WmsTaskStatus',
})
updateFormItemOptions('taskStatus', wmsTaskStatusEnum)
const sonTaskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({
 EnumName: 'SonTaskTypeEnum',
})
updateFormItemOptions('sonTaskType', sonTaskTypeEnumEnum)
  }
  commonQueryEnumForFrom()
  /**
   * å¼¹çª—打开获取详情
   */
  const onOpen = async () => {
    disabled.value = false
    updateCheckData()
  }
  watch(() => current.value, onOpen)
  return {
    formItems,
    formData,
    visible,
    formRef,
    onOpen,
    onClose,
    onConfirmQuery,
    onReset,
  }
}
HIAWms/web/src/widgets/WmsTask/Models/Service/WmsTask.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
import { Base } from '@/libs/Base/Base'
const request = Base.request
/**
 * æ·»åŠ 
 * @returns
 */
export const addWmsTask = (data: any) => {
  return request.post('/api/v1/HIAWms/wmsTask', data)
}
/**
 * æ‰¹é‡åˆ é™¤
 * @returns
 */
export const deleteWmsTasks = (ids: string[]) => {
  return request({
    data: ids,
    url: '/api/v1/HIAWms/wmsTask',
    method: 'delete',
  })
}
/**
 * å…‹éš†
 * @returns
 */
export const cloneData = (data: any) => {
  return request.post('/api/v1/HIAWms/wmsTask/clone', data)
}
HIAWms/web/src/widgets/WmsTask/Models/Service/WmsTaskDrawer.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
import { Base } from '@/libs/Base/Base'
const request = Base.request
/**
 * æ·»åŠ 
 * @returns
 */
export const addWmsTask = (data: any) => {
  return request.post('/api/v1/HIAWms/wmsTask', data)
}
/**
 * èŽ·å–è¯¦æƒ…
 * @returns
 */
export const getWmsTask = (id: string) => {
  return request.get(`/api/v1/HIAWms/wmsTask/${id}`)
}
/**
 * æ›´æ–°
 * @returns
 */
export const updateWmsTask = (id: string, data: Record<string, any>) => {
  return request.put(`/api/v1/HIAWms/wmsTask/${id}`, data)
}
/**
 * èŽ·å–æžšä¸¾
 * @returns
 */
export const getWmsEnumData = (data: any) => {
  return request.post('/api/v1/HIAWms/WmsEnum', data)
}
HIAWms/web/src/widgets/WmsTask/Models/Service/WmsTaskQueryDrawer.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
import { Base } from '@/libs/Base/Base'
const request = Base.request
/**
 * æ·»åŠ 
 * @returns
 */
export const addWmsTask = (data: any) => {
  return request.post('/api/v1/HIAWms/wmsTask', data)
}
/**
 * èŽ·å–è¯¦æƒ…
 * @returns
 */
export const getWmsTask = (id: string) => {
  return request.get(`/api/v1/HIAWms/wmsTask/${id}`)
}
/**
 * æ›´æ–°
 * @returns
 */
export const updateWmsTask = (id: string, data: Record<string, any>) => {
  return request.put(`/api/v1/HIAWms/wmsTask/${id}`, data)
}
/**
 * èŽ·å–æžšä¸¾
 * @returns
 */
export const getWmsEnumData = (data: any) => {
  return request.post('/api/v1/HIAWms/WmsEnum', data)
}
HIAWms/web/src/widgets/WmsTask/Models/WmsTask.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
import { Base } from '@/libs/Base/Base'
import {
  deleteWmsTasks,
  addWmsTask,
  cloneData,
} from './Service/WmsTask'
export class WmsTask extends Base<{ [key: string]: any }> {
  constructor() {
    super({
      data: [],
    })
  }
  onMounted() {}
  /**
   * åˆ é™¤
   * @param id
   * @returns
   */
  async deleteWmsTasks(ids: string[]) {
    return deleteWmsTasks(ids)
  }
  /**
   * æ·»åŠ æ•°æ®
   * @param data
   * @returns
   */
  addWmsTask(data: Record<string, any>) {
    return addWmsTask(data)
  }
  /**
   * å…‹éš†
   * @param ids
   * @returns
   */
  cloneData(ids: string[]) {
    return cloneData(ids)
  }
}
HIAWms/web/src/widgets/WmsTask/Models/WmsTaskDrawer.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import { Base } from '@/libs/Base/Base'
import {
  addWmsTask,
  getWmsTask,
  updateWmsTask,
  getWmsEnumData,
} from './Service/WmsTaskDrawer'
import { useGlobalState } from '@/libs/Store/Store'
export class WmsTaskDrawer extends Base<{ [key: string]: any }> {
  constructor() {
    super({
      data: [],
      wmsTask: {},
    })
  }
  /**
   * æ·»åŠ 
   * @param data
   */
  async addWmsTask(data: Record<string, any>) {
    return addWmsTask(data)
  }
  /**
   * æ›´æ–°
   * @param data
   */
  async updateWmsTask(id: string, data: Record<string, any>) {
    return updateWmsTask(id, data)
  }
  /**
   * èŽ·å–è¯¦æƒ…
   */
  async getWmsTaskDetail(current: any, id?: string) {
    return getWmsTask(id || current?.id)
  }
  //  èŽ·å–æžšä¸¾å€¼
  async getWmsEnumData(data: Record<string, any>) {
    return getWmsEnumData(data)
  }
}
HIAWms/web/src/widgets/WmsTask/Models/WmsTaskQueryDrawer.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import { Base } from '@/libs/Base/Base'
import {
  addWmsTask,
  getWmsTask,
  updateWmsTask,
  getWmsEnumData,
} from './Service/WmsTaskQueryDrawer'
import { useGlobalState } from '@/libs/Store/Store'
export class WmsTaskQueryDrawer extends Base<{ [key: string]: any }> {
  constructor() {
    super({
      data: [],
      wmsTask: {},
    })
  }
  /**
   * æ·»åŠ 
   * @param data
   */
  async addWmsTask(data: Record<string, any>) {
    return addWmsTask(data)
  }
  /**
   * æ›´æ–°
   * @param data
   */
  async updateWmsTask(id: string, data: Record<string, any>) {
    return updateWmsTask(id, data)
  }
  /**
   * èŽ·å–è¯¦æƒ…
   */
  async getWmsTaskDetail(current: any, id?: string) {
    return getWmsTask(id || current?.id)
  }
  //  èŽ·å–æžšä¸¾å€¼
  async getWmsEnumData(data: Record<string, any>) {
    return getWmsEnumData(data)
  }
}
HIAWms/web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskDrawer/WmsTaskDrawer.module.scss
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
.drawer {
  width: 800px;
}
HIAWms/web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskDrawer/WmsTaskDrawer.tsx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
import { SetupContext, defineComponent } from 'vue'
import BaseDrawer from '@/components/BaseDrawer/BaseDrawer'
import styles from './WmsTaskDrawer.module.scss'
import { useWmsTaskDrawer } from '../../../../Controllers/WmsTaskDrawer.tsx'
import DyForm from '@/components/DyForm/DyForm'
// @ts-ignore
export default defineComponent<{
  [key: string]: any
}>({
  name: '弹窗',
  props: {
    modelValue: {
      type: Boolean,
      default: false,
    },
    title: {
      type: String,
      default: '',
    },
    row: {
      type: Object,
    },
    sort: {
      type: Number,
      default: 0,
    },
  },
  emits: ['update:modelValue', 'close', 'submit', 'confirm'],
  setup(props: Record<string, any>, ctx: SetupContext) {
    const {
      onClose,
      onConfirm,
      onOpen,
      formRef,
      visible,
      formItems,
      formData,
    } = useWmsTaskDrawer(props, ctx)
    return () => (
      <BaseDrawer
        class={styles.drawer}
        size="800px"
        title={props.title || '添加'}
        v-model={visible.value}
        close-on-click-modal={true}
        onConfirm={onConfirm}
        onOpen={onOpen}
        before-close={onClose}
        onClose={onClose}
      >
        <DyForm
          ref={formRef}
          formData={formData.value}
          labelWidth="106px"
          formItemProps={formItems}
        ></DyForm>
      </BaseDrawer>
    )
  },
})
HIAWms/web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.module.scss
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
.drawer {
  width: 800px;
}
HIAWms/web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.tsx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
/*
 * ç‰©æ–™åŸºç¡€ä¿¡æ¯æŸ¥è¯¢å¼¹å‡ºæ¡†
*/
import { SetupContext, defineComponent } from 'vue'
import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
import styles from './WmsTaskQueryDrawer.module.scss'
import { useWmsTaskQueryDrawer } from '../../../../Controllers/WmsTaskQueryDrawer.tsx'
import DyForm from '@/components/DyForm/DyForm'
// @ts-ignore
export default defineComponent<{
  [key: string]: any
}>({
  name: '弹窗',
  props: {
    //枚举类型字典
    enumListDict:{
      type: Array as () => Array<{ key: string; value: object }>, // å®šä¹‰æ•°ç»„元素类型
      default: () => [] // é»˜è®¤å€¼
    },
    modelValue: {
      type: Boolean,
      default: false,
    },
    title: {
      type: String,
      default: '',
    },
    row: {
      type: Object,
    },
    sort: {
      type: Number,
      default: 0,
    },
  },
  emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'],
  setup(props: Record<string, any>, ctx: SetupContext) {
    const {
      onClose,
      onConfirmQuery,
      onOpen,
      onReset,
      formRef,
      visible,
      formItems,
      formData,
    } = useWmsTaskQueryDrawer(props, ctx)
    return () => (
      <BaseQueryDrawer
        class={styles.drawer}
        size="800px"
        title={props.title || '高级查询'}
        v-model={visible.value}
        close-on-click-modal={true}
        onReset={onReset}
        onConfirmQueryForBase={onConfirmQuery}
        onOpen={onOpen}
        before-close={onClose}
        onClose={onClose}
      >
        <DyForm
          ref={formRef}
          formData={formData.value}
          labelWidth="106px"
          formItemProps={formItems}
        ></DyForm>
      </BaseQueryDrawer>
    )
  },
})
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
export const columns = [
  {
    type: 'seq',
    width: 60,
    title: '序号',
  },
  {
    field: 'taskNo',
    title: '任务号',
  },
  {
    field: 'taskTypeDesc',
    title: '任务类型',
  },
  {
    field: 'taskStatusDesc',
    title: '任务状态',
  },
  {
    field: 'containerNo',
    title: '托盘编号',
  },
  {
    field: 'sourcePlace',
    title: '起始库位',
  },
  {
    field: 'toPlace',
    title: '目标库位',
  },
  {
    field: 'aisle',
    title: '巷道',
  },
  // {
  //   field: 'dodeviceId',
  //   title: '堆垛机ID',
  //   width: 100,
  // },
  {
    field: 'taskDodeviceStatus',
    title: '设备状态',
  },
  {
    field: 'isRead',
    title: 'WCS可读',
  },
  {
    field: 'taskLevel',
    title: '优先级',
  },
  {
    field: 'sonTaskTypeDesc',
    title: '子任务类型',
  },
  {
    field: 'sourceOrderNo',
    title: '来源单号',
  },
  {
    field: 'isNextTask',
    title: '后续任务',
  },
  {
    field: 'dodevicetype',
    title: '设备类型',
  },
  {
    field: 'creationTime',
    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,
  // },
]
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.module.scss
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,113 @@
.wmsTaskContent {
  width: 100%;
  height: 100%;
  .wmsTaskList {
    width: 100%;
    height: calc(100% - 70px);
  }
  .headerContent {
    display: flex;
    justify-content: space-between;
    align-items: center;
    height: 43px;
  }
  .header {
    margin-bottom: 12px;
    display: flex;
    justify-content: flex-start;
    align-items: center;
  }
}
.tagBox {
  width: auto;
  min-width: 80px;
  height: 24px;
  background: #ffffff;
  border-radius: 19px 19px 19px 19px;
  opacity: 1;
  border: 1px dashed #bcc4cc;
  width: 50px;
  height: 20px;
  font-size: 14px;
  font-family: PingFang SC, PingFang SC;
  font-weight: 400;
  color: #5a84ff;
  display: flex;
  justify-content: center;
  align-items: center;
  // cursor: pointer;
}
.group {
  display: flex;
  justify-content: space-between;
  align-items: center;
}
.groupTable {
  width: 100%;
}
.overBox {
  width: 100%;
  height: calc(100% - 20px);
  overflow: auto;
  :global(.cs-collapse-item__header) {
    background-color: #f1f1f1;
    padding: 0 20px;
    height: 35px;
    font-size: 16px;
    font-family: PingFang SC, PingFang SC;
    font-weight: 500;
  }
  :global(.cs-collapse-item__content) {
    padding-bottom: 0px;
  }
}
.groupHeader {
  width: 100%;
  height: 30px;
  background: #ccc;
}
.hideBlock {
  display: none;
}
.queryForm {
  padding: 10px;
  background: #f5f7fa;
  margin-bottom: 0px;
  border-radius: 4px;
  .el-form-item {
    margin-right: 20px;
    margin-bottom: 0;
    // ç»Ÿä¸€è¾“入框和选择框的宽度
    .el-input, .el-select {
      width: 200px; // è®¾ç½®ç»Ÿä¸€çš„宽度
    }
    // é€‰æ‹©æ¡†å†…部输入框样式
    .el-select .el-input__wrapper {
      height: 32px; // ä¸Žè¾“入框高度一致
      padding: 1px 11px; // ä¸Žè¾“入框内边距一致
    }
    // æ—¥æœŸé€‰æ‹©å™¨å®½åº¦
    .el-date-editor {
      width: 220px;
    }
  }
}
// å¦‚果需要更精确的控制,可以单独设置
.formItem {
  width: 200px;
  &.el-input, &.el-select {
    width: 100%;
  }
}
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,324 @@
import { computed, defineComponent, onMounted, reactive, ref } from 'vue'
import type { Ref } from 'vue'
import BaseTable from '@/components/Table/Table'
import styles from './WmsTask.module.scss'
import { useWmsTask } from '../../../Controllers/WmsTask'
import IconButton from '@/components/IconButton/IconButton'
import WmsTaskDrawer from '../Dialog/WmsTaskDrawer/WmsTaskDrawer'
import WmsTaskQueryDrawer from '../Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer'
import Search from '@/components/Search/Search'
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 {
  ElInput,
  ElSelect,
  ElOption,
  ElDatePicker,
  ElForm,
  ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
interface RenderTableType {
  url?: string
  dataSource: Ref<any[]>
  isDrag?: boolean
  isChecked?: boolean
  isHidePagination?: boolean
  params?: Record<string, any>
  autoHeight?: boolean
}
export default defineComponent({
  name: 'WmsTask',
  directives: {
    permission: vPermission,
  },
  setup(props, ctx) {
    const {
      dataSource,
      contextMenu,
      dialogConfig,
      dialogConfigForQuery,
      tableRef,
      current,
      search,
      sort,
      headers,
      onError,
      onSearch,
      onRowClick,
      onConfirmWmsTask,
      onCheck,
      onAddWmsTask,
      onAdvancedQuery,
      onExport,
      openDetail,
      onSuccess,
      onBeforeUpload,
    } = useWmsTask(props, ctx)
    //定义高级查询引用
   const wmsTaskQueryDrawerRef=ref(null);
    // æ–°å¢žçš„æŸ¥è¯¢æ¡ä»¶
    const queryForm = ref({
      searchVal: '',
      str_searchFormInputAttrs:[]
    })
    //定义整体模糊查询的列数组(注意:必须大小写跟后端的实体类属性名一致,否则会导致匹配不对的问题)
    const _searchFormInputAttrs = ref([
     'TaskNo', 'ContainerNo'
    ]);
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码');
    // åŠ¨æ€æžšä¸¾é€‰é¡¹
    const enumOptions = reactive({
      taskType: [] as Array<{label: string; value: any }>,
taskStatus: [] as Array<{label: string; value: any }>,
sonTaskType: [] as Array<{label: string; value: any }>,
    })
    // èŽ·å–æžšä¸¾æ•°æ®
    const fetchEnumData = async () => {
      try {
        const taskTypeEnumData = await getWmsEnumData({
 EnumName: 'TaskTypeEnum',
})
enumOptions.taskType = taskTypeEnumData.map((item) => ({
  label: item.description,
  value: item.value,
}))
const wmsTaskStatusData = await getWmsEnumData({
 EnumName: 'WmsTaskStatus',
})
enumOptions.taskStatus = wmsTaskStatusData.map((item) => ({
  label: item.description,
  value: item.value,
}))
const sonTaskTypeEnumData = await getWmsEnumData({
 EnumName: 'SonTaskTypeEnum',
})
enumOptions.sonTaskType = sonTaskTypeEnumData.map((item) => ({
  label: item.description,
  value: item.value,
}))
      } catch (error) {
        console.error('获取枚举数据失败:', error)
      }
    }
    // ç»„件挂载时获取枚举数据
    onMounted(() => {
      fetchEnumData()
    })
    // å®šä¹‰å“åº”式查询数据
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] });
    // æ–°ç‰ˆçš„æŸ¥è¯¢æ–¹æ³•(主页面中的按钮【查询】)
    const handleQueryForMain = async () => {
      _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);
      tableRef.value.getList(filteredData)
    }
    // æ–°ç‰ˆçš„æŸ¥è¯¢é‡ç½®
    const resetQuery = () => {
      queryForm.value.searchVal = ''
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
    }
     //新版的导出方法
     const handleExport=()=>{
      onExport(_curHighQueryData.value);
    }
    // æ–°ç‰ˆçš„æŸ¥è¯¢å¼¹å‡ºæ¡†å…³é—­æ–¹æ³•
    const closeQuery = (extraParams={}) => {
      let filteredData = commonGetHighQueryForm(extraParams);
      console.log("closeQuery方法");
      console.log(filteredData);
      commonSaveCurHighQueryData(filteredData);
    }
    //保存查询值
    const commonSaveCurHighQueryData=(filteredData={})=>{
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
    }
     //获取高级查询弹出框的查询值
     const commonGetHighQueryForm=(extraParams={})=>{
      // è¿‡æ»¤æŽ‰ undefined çš„值
      let filteredData = Object.assign(
        {},
        ...Object.entries(extraParams).map(([key, value]) =>
          value !== undefined ? { [key]: value } : {}
        )
      )
      //组合模糊查询
      filteredData.searchVal = queryForm.value.searchVal
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
      return filteredData;
    }
    /**
     * @returns è¡¨æ ¼
     */
    const RenderBaseTable = (props: RenderTableType) => {
      const {
        url,
        dataSource,
        isDrag,
        isChecked,
        isHidePagination,
        params,
        autoHeight,
      } = props
      return (
        <div
          class={{
            [styles.wmsTaskList]: true,
          }}
        >
          <BaseTable
            ref={tableRef}
            url={url}
            sortUrlTpl="/api/v1/HIAWms/wmsTask/{id}/adjustsort/{sort}"
            v-model:dataSource={dataSource.value}
            columns={columns}
            contextMenu={contextMenu}
            params={params}
            isDrag={isDrag}
            isChecked={isChecked}
            autoHeight={autoHeight}
            onCheck={onCheck}
            onRowClick={onRowClick}
            isHidePagination={isHidePagination}
            pageSize={20}
            v-slots={{
              name: ({ row }: any) => {
                return row?.name ? (
                  <TdButton
                    onClick={() => openDetail(row)}
                    text={<span style="color:#5a84ff">详情</span>}
                    icon="scale"
                    tip={row?.name}
                    hover
                  >
                    {row?.name}
                  </TdButton>
                ) : (
                  '-'
                )
              },
            }}
          ></BaseTable>
        </div>
      )
    }
    return () => {
      return (
        <div class={styles.wmsTaskContent}>
          {/* æ·»åŠ /编辑 */}
          <WmsTaskDrawer
            v-model={dialogConfig.visible}
            title={dialogConfig.title}
            row={current.value}
            sort={sort.value}
            onConfirm={onConfirmWmsTask}
          />
          {/* é«˜çº§æŸ¥è¯¢ */}
          <WmsTaskQueryDrawer
            ref="wmsTaskQueryDrawerRef"
            v-model={dialogConfigForQuery.visible}
            title={dialogConfigForQuery.title}
            row={current.value}
            sort={sort.value}
            onConfirmQuery={handleQuery}
            onRestQuery={resetQuery}
            onClose={closeQuery}
          />
          <div class={styles.headerContent}>
            <div class={styles.header}>
              <IconButton
                v-permission="wmsTask-add"
                icon="add-p"
                onClick={onAddWmsTask}
                type="primary"
              >
                æ·»åŠ 
              </IconButton>
              <el-divider direction="vertical" />
              <el-divider direction="vertical" />
              <el-upload
                v-permission="wmsTask-import"
                name="file"
                accept=".xlsx,.xls,.csv"
                show-file-list={false}
                onError={onError}
                onSuccess={onSuccess}
                before-upload={onBeforeUpload}
                headers={headers.value}
                action="/api/v1/HIAWms/wmsTask/import"
              >
                <IconButton icon="in">导入</IconButton>
              </el-upload>
              <IconButton
                v-permission="wmsTask-output"
                icon="out"
                onClick={handleExport}
              >
                å¯¼å‡º
              </IconButton>
            </div>
            <ElFormItem style={{ marginTop: '15px' }}>
              <ElFormItem label="关键字">
                <ElInput
                  v-model={queryForm.value.searchVal}
                  placeholder={searchFormInputAttrs_Placeholder.value}
                  clearable
                  class={styles.formItem}
                />
              </ElFormItem>
              <IconButton type="primary" icon="search" onClick={handleQueryForMain}>
                æŸ¥è¯¢
              </IconButton>
              {/* <IconButton style="" icon="refresh" onClick={resetQuery}>
                é‡ç½®
              </IconButton> */}
              <IconButton
                v-permission="wmsTask-add"
                icon="search"
                onClick={onAdvancedQuery}
                type="primary"
              >
                é«˜çº§æŸ¥è¯¢
              </IconButton>
            </ElFormItem>
          </div>
          <RenderBaseTable
            url="/api/v1/HIAWms/wmsTask/page"
            dataSource={dataSource}
            isChecked={true}
            isDrag={true}
          />
        </div>
      )
    }
  },
})
HIAWms/web/src/widgets/WmsTask/Views/WmsTask.module.scss
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
.WmsTask {
  background-color: #fff;
  border-radius: 5px 5px 0 0;
  width: 100%;
  height: 100%;
  border: 1px solid #dbdbdb;
}
HIAWms/web/src/widgets/WmsTask/Views/WmsTask.tsx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
import {
  Component,
  DefineComponent,
  defineComponent,
  markRaw,
  ref,
  SetupContext,
  onMounted,
} from 'vue'
import styles from './WmsTask.module.scss'
import Tab from '@/components/Tab/Tab'
import { useProvideModels } from '@/libs/Provider/app'
import { usePermission } from '@/libs/Permission/Permission'
import { permissionCodes } from '../enum'
import { ModuleType, TabItem } from '../type/Type'
import { getEntityNames } from '@/hooks/hook'
import TabPane from '@/components/Tab/TabPane'
const Models: ModuleType = import.meta.glob('./config/*.json', {
  eager: true,
})
const entityNames = getEntityNames(Models)
const nameToLabelMap = [{ name: 'WmsTask', label: 'Wms任务管理' }]
export default defineComponent({
  name: 'WmsTask',
  setup(props, ctx: SetupContext) {
    useProvideModels()
    usePermission(props, permissionCodes)
    const rf = ref<{
      [key: string]: any
    }>({})
    const tabData = ref<TabItem[]>([])
    const onTabChange = (v: string) => {
      rf.value?.[v]?.reloadList()
    }
    const initTableData = async () => {
      for (const i in entityNames) {
        const name = entityNames[i]
        const module = await import(`./Pages/${name}/${name}.tsx`)
        const WmsTask = markRaw(module.default)
        const foundLabel =
          nameToLabelMap.find((item) => item.name === name)?.label || name
        tabData.value.push({
          label: foundLabel,
          name,
          component: WmsTask,
        })
      }
    }
    initTableData()
    return () => {
      return (
        <div class={styles.WmsTask}>
          <Tab data={tabData.value} type="list" onTab={onTabChange}>
            {tabData.value.map((widgetInfo) => {
              const Widget: any = widgetInfo.component
              return (
                <TabPane label={widgetInfo.label} name={widgetInfo.name}>
                  <Widget
                    ref={(r: any) => (rf.value['WmsTask'] = r)}
                  ></Widget>
                </TabPane>
              )
            })}
          </Tab>
        </div>
      )
    }
  },
})
HIAWms/web/src/widgets/WmsTask/Views/config/WmsTask.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
{
  "name": "WmsTask"
}
HIAWms/web/src/widgets/WmsTask/enum.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
export interface TabType {
  label: string
  name: string
  columns?: any[]
  data?: any[]
  isFooter: boolean
  [key: string]: any
}
export const permissionCodes = {
  'wmsTask-list': '列表-列表',
  'wmsTask-add': '列表-添加',
  'wmsTask-import': '列表-导入',
  'wmsTask-output': '列表-输出',
}
HIAWms/web/src/widgets/WmsTask/index.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
import WmsTask from './Views/WmsTask'
import Setting from '@/components/Setting/Setting'
import { provider } from '@/provider/index'
import p from '../../assets/svg/p.svg'
export default {
  is: 'WmsTask',
  name: 'Wms任务管理',
  category: 'run',
  icon: p,
  authorizationRequired: false,
  canvasView: provider(WmsTask),
  settingsView: Setting,
}
HIAWms/web/src/widgets/WmsTask/type/type.d.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
import { Component } from 'vue'
export interface DataItemType {
  id?: string
  name?: string
  code?: string
  description?: string
  label?: string
  value?: string | number
}
export interface WmsTaskBaseType {
  id?: string
  name?: string
  code?: string
  value?: number
  description?: string
  options?: Array<DataItemType>
  abilityValue?: number | string
  data?: DataItemType
  defaultValue?: string | number
  flow: string
}
export interface FlowDefinitionType {
  id?: string
  name?: string
  code?: string
  description?: string
}
export type ModuleType = Record<
  string,
  {
    default: Record<string, string>
    name: string
  }
>
export interface TabItem {
  name: string
  label: string
  component: Component
  hidden?: boolean
}
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/MainForm.cs
@@ -236,6 +236,9 @@
                var str_enumList = this.tb_EnumList.Text.Trim();
                if (str_enumList.IndexOf(',') > -1)
                {
                    str_enumList = str_enumList.Replace("\n","");
                    str_enumList = str_enumList.Replace("\t", "");
                    str_enumList = str_enumList.Replace("\r", "");
                    var arr_enumList = str_enumList.Split(',');
                    foreach (var item in arr_enumList)
                    {
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/AppService/AppServiceÄ£°å.txt
@@ -282,7 +282,7 @@
            foreach (var impItem in importItems)
            {
                if (impItem.$ValidateRepeatName$.IsNullOrWhiteSpace() && impItem.MaterialName.IsNullOrWhiteSpace())
                if (impItem.$ValidateRepeatName$.IsNullOrWhiteSpace())
                {
                    continue;
                }
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Controllers/EntityModeQueryDrawerÄ£°å.txt
@@ -93,20 +93,6 @@
  const onReset = async () => {
    formData.value = {}
    $Save_PageAddFormAttributes_Query_Clear$
    formData.value.materialCode = ''
    formData.value.materialName = ''
    formData.value.purchaseType = ''
    formData.value.materialType = ''
    formData.value.primaryUnit = ''
    formData.value.standard = ''
    formData.value.outerDiameter = ''
    formData.value.wallThickness = ''
    formData.value.materialQuality = ''
    formData.value.length = ''
    formData.value.isMainBranch = ''
    formData.value.factory = ''
    formData.value.certification = ''
    formData.value.remark = ''
    //向父组件发送自定义事件
    ctx.emit('restQuery');
  }