出入库记录

zs

2025-05-06 5f1a99026511f4ed521891829b67ef6c177f82e5

出入库记录

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj

@@ -18,4 +18,10 @@
        <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain.Shared\CMS.Plugin.HIAWms.Domain.Shared.csproj" />
    </ItemGroup>

    <ItemGroup>
      <Reference Include="CmsQueryExtensions">
        <HintPath>..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
      </Reference>
    </ItemGroup>

</Project>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,229 @@
using CmsQueryExtensions.Extension; 
using Volo.Abp.Application.Dtos; 
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表查询参数 
/// </summary> 
public class GetWmsInOutStockRecordInput : 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 string OrderNo { get; set; }

        /// <summary>
        /// å•æ®ç¼–号-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum OrderNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// ç‰©æ–™ä»¶å·
        /// </summary>
        public string MaterialNo { get; set; }

        /// <summary>
        /// ç‰©æ–™ä»¶å·-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        public int?  StockType { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum StockType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å®¹å™¨ç¼–号
        /// </summary>
        public string ContainerNo { get; set; }

        /// <summary>
        /// å®¹å™¨ç¼–号-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æœºåž‹
        /// </summary>
        public string MaterialModel { get; set; }

        /// <summary>
        /// æœºåž‹-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialModel_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ“ä½œæ—¶é—´
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> OperateTime { get; set; }


        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }

        /// <summary>
        /// å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        public string MaterialId { get; set; }

        /// <summary>
        /// ç‰©æ–™ID-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

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

        /// <summary>
        /// ä»»åŠ¡å·-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

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

        /// <summary>
        /// èµ·å§‹åº“位-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

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

        /// <summary>
        /// ç›®æ ‡åº“位-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

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


        /// <summary>
        /// 
        /// </summary>
        public string LastModifierId { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// 
        /// </summary>
        public bool?  IsDeleted { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDeleted_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; }


 
} 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表创建参数对象 
/// </summary> 
public class WmsInOutStockRecordCreateDto : WmsInOutStockRecordCreateOrUpdateDtoBase 
{ 
    /// <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/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs

copy from HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs
copy to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs
Îļþ´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs ¸´ÖÆ
@@ -1,17 +1,13 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Application.Dtos; 

namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecords
{
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
    /// <summary>
    /// å‡ºå…¥åº“记录.
/// å‡ºå…¥åº“记录表创建或更新基类 
    /// </summary>
    public class WmsInOutStockRecord : FullAuditedAggregateRoot<Guid>
public abstract class WmsInOutStockRecordCreateOrUpdateDtoBase : ExtensibleEntityDto 
    {
        /// <summary>
        /// å•æ®ç¼–号
@@ -34,12 +30,12 @@
        public StockTypeEnum StockType { get; set; }

        /// <summary>
        /// å®¹å™¨ç¼–号.
        /// å®¹å™¨ç¼–号
        /// </summary>
        public string? ContainerNo { get; set; }

        /// <summary>
        /// åž‹å·
        /// æœºåž‹
        /// </summary>
        public string? MaterialModel { get; set; }

@@ -73,6 +69,22 @@
        /// </summary>
        public string? ToPlace { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? CreatorId { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? LastModifierId { get; set; }

 
 
    /// <summary> 
    /// Initializes a new instance of the <see cref="WmsInOutStockRecordCreateOrUpdateDtoBase"/> class. 
    /// </summary> 
    public WmsInOutStockRecordCreateOrUpdateDtoBase() : base(false) 
    { 
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
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.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表数据参数对象 
/// </summary> 
public  class WmsInOutStockRecordDto:  ExtensibleEntityDto<Guid>, IHasConcurrencyStamp 
{ 
            /// <summary>
        /// å•æ®ç¼–号
        /// </summary>
        public string OrderNo { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string? MaterialName { get; set; }

        /// <summary>
        /// ç‰©æ–™ä»¶å·
        /// </summary>
        public string MaterialNo { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        public StockTypeEnum StockType { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        public string StockTypeDesc
        { 
            get 
            { 
                return GetEnumDescriptionUtil.GetEnumDescription(StockType); 
            } 
        } 
        /// <summary>
        /// å®¹å™¨ç¼–号
        /// </summary>
        public string? ContainerNo { get; set; }

        /// <summary>
        /// æœºåž‹
        /// </summary>
        public string? MaterialModel { get; set; }

        /// <summary>
        /// æ“ä½œæ—¶é—´
        /// </summary>
        public DateTime? OperateTime { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? Remark { get; set; }

        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        public string MaterialId { get; set; }

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

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

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

        /// <summary>
        /// 
        /// </summary>
        public ExtraPropertyDictionary? ExtraProperties { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? ConcurrencyStamp { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public DateTime CreationTime { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? CreatorId { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public DateTime? LastModificationTime { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? LastModifierId { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public bool IsDeleted { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? DeleterId { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public DateTime? DeletionTime { get; set; }

 
 
    /// <summary> 
    /// 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/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
using MiniExcelLibs.Attributes; 
using System.ComponentModel.DataAnnotations; 
using System.ComponentModel; 
using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表导出模型 
/// </summary> 
public  class WmsInOutStockRecordExportModel 
{ 
            /// <summary>
        /// å•æ®ç¼–号
        /// </summary>
        [ExcelColumn(Name = "单据编号", Width = 25)]
        public string OrderNo { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        [ExcelColumn(Name = "物料名称", Width = 25)]
        public string MaterialName { get; set; }

        /// <summary>
        /// ç‰©æ–™ä»¶å·
        /// </summary>
        [ExcelColumn(Name = "物料件号", Width = 25)]
        public string MaterialNo { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        [ExcelColumn(Name = "操作类型", Width = 25)]
        public StockTypeEnum StockType { get; set; }

        /// <summary>
        /// å®¹å™¨ç¼–号
        /// </summary>
        [ExcelColumn(Name = "容器编号", Width = 25)]
        public string ContainerNo { get; set; }

        /// <summary>
        /// æœºåž‹
        /// </summary>
        [ExcelColumn(Name = "机型", Width = 25)]
        public string MaterialModel { get; set; }

        /// <summary>
        /// æ“ä½œæ—¶é—´
        /// </summary>
        [ExcelColumn(Name = "操作时间", Width = 25)]
        public DateTime OperateTime { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "备注", Width = 25)]
        public string Remark { get; set; }

        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        [ExcelColumn(Name = "物料ID", Width = 25)]
        public string MaterialId { get; set; }

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

        /// <summary>
        /// èµ·å§‹åº“位
        /// </summary>
        [ExcelColumn(Name = "起始库位", Width = 25)]
        public string SourcePlace { 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/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
using Volo.Abp.Domain.Entities; 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表更新参数对象 
/// </summary> 
public class WmsInOutStockRecordUpdateDto : WmsInOutStockRecordCreateOrUpdateDtoBase, IHasConcurrencyStamp 
{ 
   /// <summary> 
    /// å¹¶å‘戳 
    /// </summary> 
    public string ConcurrencyStamp { get; set; } 
} 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord 
{ 
    /// <summary> 
    /// å‡ºå…¥åº“记录表导入模型 
    /// </summary> 
    public class WmsInOutStockRecordsImportModel 
    { 
        private List<WmsInOutStockRecordImportModel> _WmsInOutStockRecords = new(); 
 
        public List<WmsInOutStockRecordImportModel> WmsInOutStockRecords 
        { 
            get => _WmsInOutStockRecords; 
            set 
            { 
                _WmsInOutStockRecords = value; 
                var rowIndex = 2; 
                _WmsInOutStockRecords?.ForEach(x => x.RowIndex = rowIndex++); 
            } 
        } 
 
        /// <summary> 
        /// å‡ºå…¥åº“记录表导入模型 
        /// </summary> 
        public class WmsInOutStockRecordImportModel : WmsInOutStockRecordExportModel 
        { 
            /// <summary> 
            /// è¡Œå· 
            /// </summary> 
            public int RowIndex { get; set; } 
        } 
    } 
} 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
using Volo.Abp.Application.Services; 
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Services; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表应用服务接口 
/// </summary> 
public interface IWmsInOutStockRecordAppService : ICrudAppService<WmsInOutStockRecordDto, Guid, GetWmsInOutStockRecordInput, WmsInOutStockRecordCreateDto, WmsInOutStockRecordUpdateDto> 
{ 
    /// <summary> 
    /// å…‹éš†å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    Task<List<WmsInOutStockRecordDto>> CloneAsync(IEnumerable<Guid> ids); 
 
    /// <summary> 
    /// åˆ é™¤å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    Task DeleteManyAsync(IEnumerable<Guid> ids); 
 
    /// <summary> 
    /// è°ƒæ•´æŽ’序出入库记录表 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="sort"></param> 
    /// <returns></returns> 
    Task AdjustSortAsync(Guid id, int sort); 
 
    /// <summary> 
    /// å¯¼å…¥å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    Task ImportAsync(WmsInOutStockRecordsImportModel input); 
 
    /// <summary> 
    /// å¯¼å‡ºå‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsInOutStockRecordInput input); 
} 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,319 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
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.WmsInOutStockRecord;
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> 
/// å‡ºå…¥åº“记录表应用服务 
/// </summary> 
public class WmsInOutStockRecordAppService : CMSPluginAppService, IWmsInOutStockRecordAppService 
{ 
    private readonly IWmsInOutStockRecordRepository _wmsInOutStockRecordRepository; 
 
    /// <summary> 
    /// Initializes a new instance of the <see cref="WmsInOutStockRecordAppService"/> class. 
    /// </summary> 
    /// <param name="WmsInOutStockRecordRepository">The task job repository.</param> 
    public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository wmsInOutStockRecordRepository) 
    { 
        _wmsInOutStockRecordRepository = wmsInOutStockRecordRepository; 
    } 
 
    /// <summary> 
    /// èŽ·å–指定出入库记录表 
    /// </summary> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    public virtual async Task<WmsInOutStockRecordDto> GetAsync(Guid id) 
    { 
        return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(await _wmsInOutStockRecordRepository.GetAsync(id)); 
    } 
 
    /// <summary> 
    /// åˆ†é¡µèŽ·å–出入库记录表 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    public virtual async Task<PagedResultDto<WmsInOutStockRecordDto>> GetListAsync(GetWmsInOutStockRecordInput input) 
    { 
        Check.NotNull(input, nameof(input)); 
 
        if (input.Sorting.IsNullOrWhiteSpace()) 
        { 
            input.Sorting = nameof(WmsInOutStockRecord.Sort); 
        } 
 
        #region åŠ¨æ€æž„造查询条件  
 
        //动态构造查询条件  
        var whereConditions = DynamicGetQueryParams(input); 
 
        #endregion 
 
        var count = await _wmsInOutStockRecordRepository.GetCountAsync(whereConditions); 
        var list = await _wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); 
 
        return new PagedResultDto<WmsInOutStockRecordDto>(count, ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list)); 
    } 
 
    /// <summary>  
    /// åŠ¨æ€æž„造查询条件  
    /// </summary>  
    /// <param name="input">输入参数</param>  
    /// <returns></returns>  
    private FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> DynamicGetQueryParams(GetWmsInOutStockRecordInput input) 
    { 
        //动态构造查询条件  
        var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsInOutStockRecord, GetWmsInOutStockRecordInput>(input); 
        if (!whereConditions.IsSuccess) 
        { 
            throw new Exception("动态构造查询条件失败:" + whereConditions.ErrMsg); 
        } 
 
        //也可再次自定义构建查询条件  
        Expression<Func<WmsInOutStockRecord, bool>> extendExpression = a => a.IsDeleted == false; 
        // ä½¿ç”¨ System.Linq.PredicateBuilder çš„ And 
        var pres = (System.Linq.Expressions.Expression<Func<WmsInOutStockRecord, bool>>)(whereConditions.data); 
        whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression); 
 
        return whereConditions; 
    } 
 
    /// <summary> 
    /// æ–°å»ºå‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public virtual async Task<WmsInOutStockRecordDto> CreateAsync(WmsInOutStockRecordCreateDto input) 
    { 
        await CheckCreateOrUpdateDtoAsync(input); 
 
      
 
        var maxSort = await _wmsInOutStockRecordRepository.GetMaxSortAsync(); 
        var sort = input.Sort ?? maxSort; 
 
        var insertObj = ObjectMapper.Map<WmsInOutStockRecordCreateDto, WmsInOutStockRecord>(input); 
        insertObj.Sort = sort; 
        input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None); 
 
        await _wmsInOutStockRecordRepository.InsertAsync(insertObj); 
 
        if (input.Sort.HasValue && insertObj.Sort != maxSort) 
        { 
            await AdjustSortAsync(insertObj.Id, insertObj.Sort); 
        } 
 
        return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(insertObj); 
    } 
 
    /// <summary> 
    /// æ›´æ–°å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public virtual async Task<WmsInOutStockRecordDto> UpdateAsync(Guid id, WmsInOutStockRecordUpdateDto input) 
    { 
        await CheckCreateOrUpdateDtoAsync(input); 
 
        var updateObj = await _wmsInOutStockRecordRepository.GetAsync(id); 
     
 
        updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); 
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None); 
 
                updateObj.OrderNo = input.OrderNo;
        updateObj.MaterialName = input.MaterialName;
        updateObj.MaterialNo = input.MaterialNo;
        updateObj.StockType = input.StockType;
        updateObj.ContainerNo = input.ContainerNo;
        updateObj.MaterialModel = input.MaterialModel;
        updateObj.OperateTime = input.OperateTime;
        updateObj.Remark = input.Remark;
        updateObj.MaterialId = input.MaterialId;
        updateObj.TaskNo = input.TaskNo;
        updateObj.SourcePlace = input.SourcePlace;
        updateObj.ToPlace = input.ToPlace;
 
 
        await _wmsInOutStockRecordRepository.UpdateAsync(updateObj); 
 
        return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(updateObj); 
    } 
 
    /// <summary> 
    /// å…‹éš†å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    public async Task<List<WmsInOutStockRecordDto>> CloneAsync(IEnumerable<Guid> ids) 
    { 
        //var wmsInOutStockRecords = new List<WmsInOutStockRecord>(); 
        //if (ids != null) 
        //{ 
        //    var sort = await wmsInOutStockRecordRepository.GetMaxSortAsync(); 
        //    foreach (var id in ids) 
        //    { 
        //        var WmsInOutStockRecord = await wmsInOutStockRecordRepository.FindAsync(id); 
        //        if (WmsInOutStockRecord != null) 
        //        { 
        //            var name = WmsInOutStockRecord.Name + WmsInOutStockRecordConsts.CloneTag; 
        //            var notExist = false; 
        //            while (!notExist) 
        //            { 
        //                var exist = await wmsInOutStockRecordRepository.NameExistAsync(name); 
        //                if (exist || wmsInOutStockRecords.Any(x => x.Name == name)) 
        //                { 
        //                    name += WmsInOutStockRecordConsts.CloneTag; 
        //                    continue; 
        //                } 
 
        //                notExist = true; 
        //            } 
 
        //            //WmsInOutStockRecord = await wmsInOutStockRecordRepository.InsertAsync(WmsInOutStockRecord.Clone(GuidGenerator.Create(), name, sort++)); 
        //            wmsInOutStockRecords.Add(WmsInOutStockRecord); 
        //        } 
        //    } 
        //} 
 
        //return ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(wmsInOutStockRecords); 
        return new List<WmsInOutStockRecordDto>(); 
    } 
 
    /// <summary> 
    /// åˆ é™¤å•ä¸ªå‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    public virtual Task DeleteAsync(Guid id) 
    { 
        return _wmsInOutStockRecordRepository.DeleteAsync(id); 
    } 
 
    /// <summary> 
    /// åˆ é™¤å¤šä¸ªå‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    public async Task DeleteManyAsync(IEnumerable<Guid> ids) 
    { 
        foreach (var id in ids) 
        { 
            await DeleteAsync(id); 
        } 
    } 
 
    /// <summary> 
    /// è°ƒæ•´æŽ’序出入库记录表 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="sort"></param> 
    /// <returns></returns> 
    public virtual async Task AdjustSortAsync(Guid id, int sort) 
    { 
        var list = await _wmsInOutStockRecordRepository.GetListAsync(null, nameof(WmsInOutStockRecord.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 _wmsInOutStockRecordRepository.UpdateManyAsync(list); 
    } 
 
    /// <summary> 
    /// å¯¼å…¥å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public async Task ImportAsync(WmsInOutStockRecordsImportModel input) 
    { 
        
    } 
 
    /// <summary> 
    /// å¯¼å‡ºå‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsInOutStockRecordInput input) 
    { 
        Check.NotNull(input, nameof(input)); 
 
        if (input.Sorting.IsNullOrWhiteSpace()) 
        { 
            input.Sorting = nameof(WmsInOutStockRecord.Sort); 
        } 
 
        #region åŠ¨æ€æž„造查询条件  
 
        //动态构造查询条件  
        var whereConditions = DynamicGetQueryParams(input); 
 
        #endregion 
 
 
        var list = await _wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true); 
        var result = ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list); 
 
        var sheets = new Dictionary<string, object> 
        { 
            ["配置"] = ExportHelper.ConvertListToExportData(result), 
        }; 
 
        var fileName = result.Count > 1 ? "WmsInOutStockRecord列表" : result.Count == 1 ? result[0]?.MaterialName : "WmsInOutStockRecord模版"; 
        return (sheets, fileName); 
    } 
 
    /// <summary> 
    /// æ ¡éªŒå‡ºå…¥åº“记录表，当新建或更新时 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    protected Task CheckCreateOrUpdateDtoAsync(WmsInOutStockRecordCreateOrUpdateDtoBase input) 
    { 
        Check.NotNull(input, nameof(input)); 
                Check.NotNullOrWhiteSpace(input.OrderNo, "单据编号", 50);
        Check.NotNullOrWhiteSpace(input.MaterialNo, "物料件号", 50);
        Check.NotNull(input.StockType, "操作类型");
        Check.NotNullOrWhiteSpace(input.MaterialId, "物料ID", 50);
        Check.NotNullOrWhiteSpace(input.TaskNo, "任务号", 50);
 
        return Task.CompletedTask; 
    } 
} 

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/SonTaskTypeEnum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
{
    /// <summary>
    /// å­ä»»åŠ¡ç±»åž‹
    /// </summary>
    [Description("子任务类型")]
    public enum SonTaskTypeEnum
    {
        /// <summary>
        /// è‡ªåŠ¨å…¥åº“
        /// </summary>
        [Description("自动入库")]
        ZDRUKU = 1,

        /// <summary>
        /// äººå·¥å…¥åº“
        /// </summary>
        [Description("人工入库")]
        RGRUKU = 2,

        /// <summary>
        /// äººå·¥å‡ºåº“
        /// </summary>
        [Description("人工出库")]
        RGCHUKU = 3,
        /// <summary>
        /// è‡ªåŠ¨å‡ºåº“
        /// </summary>
        [Description("自动出库")]
        ZDCHUKU = 4,

        /// <summary>
        /// ç©ºæ‰˜å‘¼å«
        /// </summary>
        [Description("空托呼叫")]
        KTHUJIOA = 5,

        /// <summary>
        /// å›žåº“
        /// </summary>
        [Description("回库")]
        HUIKU = 6,
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/TaskTypeEnum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
{
    /// <summary>
    /// ä»»åŠ¡ç±»åž‹
    /// </summary>
    [Description("任务类型")]
    public enum TaskTypeEnum
    {
        /// <summary>
        /// å‡ºåº“
        /// </summary>
        [Description("出库")]
        CHUKU = 1,

        /// <summary>
        /// å…¥åº“
        /// </summary>
        [Description("入库")]
        RUKU = 2,
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/WmsTaskStatus.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
{
    /// <summary>
    /// ä»»åŠ¡çŠ¶æ€
    /// </summary>
    [Description("任务状态")]
    public enum WmsTaskStatus
    {
        /// <summary>
        /// æœªæ‰§è¡Œ
        /// </summary>
        [Description("未执行")]
        WEIZHIXING = 1,
        /// <summary>
        /// å¾…执行
        /// </summary>
        [Description("待执行")]
        DAIZHIXINGZHONG = 2,
        /// <summary>
        /// æ‰§è¡Œä¸­
        /// </summary>
        [Description("执行中")]
        ZHIXINGZHONG = 3,
        /// <summary>
        /// å®Œæˆ
        /// </summary>
        [Description("完成")]
        WANCHENG = 4,
        /// <summary>
        /// å–消
        /// </summary>
        [Description("取消")]
        QUXIAO = 5
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj

@@ -21,8 +21,13 @@
    <ItemGroup>
      <Folder Include="WmsInOutStockOrders\" />
      <Folder Include="WmsInOutStockOrderDetails\" />
      <Folder Include="WmsTasks\" />
      <Folder Include="WmsMaterialContainers\" />
    </ItemGroup>

    <ItemGroup>
      <Reference Include="CmsQueryExtensions">
        <HintPath>..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
      </Reference>
    </ItemGroup>

</Project>

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs

@@ -23,6 +23,25 @@
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        public string ContainerNo { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        public virtual int Sort { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }

        /// <summary>
        /// Adjusts the sort.
        /// </summary>
        /// <param name="sort">The sort.</param>
        public void AdjustSort(int sort)
        {
            Sort = sort;
        }
    }

}

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
using CmsQueryExtensions.Extension; 
using System.Linq.Expressions; 
using Volo.Abp.Domain.Repositories; 
 
namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表仓储 
/// </summary> 
public interface IWmsInOutStockRecordRepository : IBasicRepository<WmsInOutStockRecord, Guid> 
{ 
    /// <summary> 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="materialNo"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    Task<WmsInOutStockRecord> FindByNameAsync(string materialNo, CancellationToken cancellationToken = default); 
 
    /// <summary> 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="materialNo"></param> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    Task<bool> NameExistAsync(string materialNo, Guid? id = null); 
 
    /// <summary> 
    /// èŽ·å–最大排序出入库记录表 
    /// </summary> 
    /// <returns></returns> 
    Task<int> GetMaxSortAsync(); 
 
    /// <summary> 
    /// èŽ·å–分页列表出入库记录表 
    /// </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<WmsInOutStockRecord>> GetListAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default); 
 
    /// <summary> 
    /// èŽ·å–总数出入库记录表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> whereConditions, CancellationToken cancellationToken = default); 
} 

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/WmsInOutStockRecord.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs ÐÞ¸Ä
@@ -6,7 +6,7 @@
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities.Auditing;

namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecords
namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord
{
    /// <summary>
    /// å‡ºå…¥åº“记录.
@@ -73,6 +73,23 @@
        /// </summary>
        public string? ToPlace { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        public virtual int Sort { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }

        /// <summary>
        /// Adjusts the sort.
        /// </summary>
        /// <param name="sort">The sort.</param>
        public void AdjustSort(int sort)
        {
            Sort = sort;
        }
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,126 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities.Auditing;

namespace CMS.Plugin.HIAWms.Domain.WmsTask
{
    /// <summary>
    /// ä»»åŠ¡
    /// </summary>W
    public class WmsTask : FullAuditedAggregateRoot<Guid>
    {
        /// <summary>
        /// ä»»åŠ¡å·
        /// </summary>
        public string TaskNo { get; set; }

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

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

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

        /// <summary>
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        public string? ContainerNo { get; set; }

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

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

        /// <summary>
        /// å··é“
        /// </summary>
        public int? Aisle { get; set; }
        /// <summary>
        /// å †åž›æœºID
        /// </summary>
        public int? DodeviceId { get; set; }

        /// <summary>
        /// è®¾å¤‡ç±»åž‹
        /// </summary>
        public int Dodevicetype { get; set; }


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

        /// <summary>
        /// WCS是否可以读取
        /// </summary>
        public bool IsRead { get; set; }

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

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

        /// <summary>
        /// ä»»åŠ¡å…³è”的下个任务是否生成成功，失败为1，其他无操作
        /// </summary>
        public int? IsNextTask { get; set; }

        /// <summary>
        /// å¯å˜å˜é‡1
        /// </summary>
        public string? MutableParam1 { get; set; }

        /// <summary>
        /// å¯å˜å˜é‡2
        /// </summary>
        public string? MutableParam2 { get; set; }

        /// <summary>
        /// å¯å˜å˜é‡3
        /// </summary>
        public string? MutableParam3 { get; set; }
        /// <summary>
        /// æŽ’序
        /// </summary>
        public virtual int Sort { get; set; }


        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }

        /// <summary>
        /// Adjusts the sort.
        /// </summary>
        /// <param name="sort">The sort.</param>
        public void AdjustSort(int sort)
        {
            Sort = sort;
        }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMS.Plugin.HIAWms.EntityFrameworkCore.csproj

@@ -16,4 +16,10 @@
        <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain\CMS.Plugin.HIAWms.Domain.csproj" />
    </ItemGroup>

    <ItemGroup>
      <Reference Include="CmsQueryExtensions">
        <HintPath>..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
      </Reference>
    </ItemGroup>

</Project>

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainerPlace.cs

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs

@@ -1,12 +1,6 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.WmsContainerPlaces;
using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecords;
using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;

@@ -108,6 +102,9 @@
                    .IsRequired(false)
                    .HasComment("目标库位");

                b.Property(x => x.Sort).HasComment("排序");
                b.Property(x => x.IsDisabled).IsRequired(false).HasComment("是否禁用");

                // Indexes
                b.HasIndex(x => x.OrderNo);
                b.HasIndex(x => x.MaterialNo);

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsTask.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,159 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.WmsContainerPlaces;
using CMS.Plugin.HIAWms.Domain.WmsTask;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;

namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions
{
    /// <summary>
    ///  EfCore扩展
    /// </summary>
    public static partial class CMSPluginEfCoreExtensions
    {
        /// <summary>
        /// Includes the details.
        /// </summary>
        /// <param name="queryable">The queryable.</param>
        /// <param name="include">if set to <c>true</c> [include].</param>
        /// <returns></returns>
        public static IQueryable<WmsTask> IncludeDetails(this IQueryable<WmsTask> queryable, bool include = true)
        {
            if (!include)
            {
                return queryable;
            }

            return queryable;
        }
        /// <summary>
        /// Configures the WMS task entity.
        /// </summary>
        /// <param name="builder">The builder.</param>
        public static void ConfigureWmsTask(this ModelBuilder builder)
        {
            Check.NotNull(builder, nameof(builder));

            builder.Entity<WmsTask>(b =>
            {
                b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsTasks").ToLower(), CMSPluginDbProperties.DbSchema)
                    .HasComment("任务表");

                b.ConfigureByConvention();

                // Primary key configuration (inherited from FullAuditedAggregateRoot<Guid>)
                b.HasKey(x => x.Id);

                // Properties configuration
                b.Property(x => x.TaskNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("任务号");

                b.Property(x => x.TaskType)
                    .IsRequired()
                    .HasComment("任务类型");

                b.Property(x => x.TaskLevel)
                    .IsRequired()
                    .HasComment("任务等级");

                b.Property(x => x.TaskStatus)
                    .IsRequired()
                    .HasComment("任务状态");

                b.Property(x => x.ContainerNo)
                    .HasMaxLength(50)
                    .IsRequired(false)
                    .HasComment("托盘编号");

                b.Property(x => x.SourcePlace)
                    .HasMaxLength(50)
                    .IsRequired(false)
                    .HasComment("起始库位");

                b.Property(x => x.ToPlace)
                    .HasMaxLength(50)
                    .IsRequired(false)
                    .HasComment("目标库位");

                b.Property(x => x.Aisle)
                    .IsRequired(false)
                    .HasComment("巷道");

                b.Property(x => x.DodeviceId)
                    .IsRequired(false)
                    .HasComment("堆垛机ID");

                b.Property(x => x.Dodevicetype)
                    .IsRequired()
                    .HasComment("设备类型");

                b.Property(x => x.TaskDodeviceStatus)
                    .IsRequired()
                    .HasComment("设备任务状态");

                b.Property(x => x.IsRead)
                    .IsRequired()
                    .HasComment("WCS是否可以读取");

                b.Property(x => x.SonTaskType)
                    .IsRequired(false)
                    .HasComment("子任务类型");

                b.Property(x => x.SourceOrderNo)
                    .HasMaxLength(50)
                    .IsRequired(false)
                    .HasComment("来源单据号");

                b.Property(x => x.IsNextTask)
                    .IsRequired(false)
                    .HasComment("下个任务是否生成成功");

                b.Property(x => x.MutableParam1)
                    .HasMaxLength(200)
                    .IsRequired(false)
                    .HasComment("可变变量1");

                b.Property(x => x.MutableParam2)
                    .HasMaxLength(200)
                    .IsRequired(false)
                    .HasComment("可变变量2");

                b.Property(x => x.MutableParam3)
                    .HasMaxLength(200)
                    .IsRequired(false)
                    .HasComment("可变变量3");

                b.Property(x => x.Sort)
                    .IsRequired()
                    .HasComment("排序");

                b.Property(x => x.IsDisabled)
                    .IsRequired(false)
                    .HasComment("是否禁用");

                // Indexes configuration
                b.HasIndex(x => x.TaskNo).IsUnique();
                b.HasIndex(x => x.TaskType);
                b.HasIndex(x => x.TaskStatus);
                b.HasIndex(x => x.ContainerNo);
                b.HasIndex(x => x.SourcePlace);
                b.HasIndex(x => x.ToPlace);
                b.HasIndex(x => x.DodeviceId);
                b.HasIndex(x => x.IsRead);
                b.HasIndex(x => x.SourceOrderNo);
                b.HasIndex(x => x.Sort);

                b.ApplyObjectExtensionMappings();
            });
        }
    }
    
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,113 @@
using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord; 
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> 
/// å‡ºå…¥åº“记录表仓储实现 
/// </summary> 
public class EfCoreWmsInOutStockRecordRepository : EfCoreRepository<ICMSPluginDbContext, WmsInOutStockRecord, Guid>, IWmsInOutStockRecordRepository 
{ 
    /// <summary> 
    /// Initializes a new instance of the <see cref="EfCoreWmsInOutStockRecordRepository"/> class. 
    /// </summary> 
    /// <param name="dbContextProvider">The database context provider.</param> 
    public EfCoreWmsInOutStockRecordRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider) 
        : base(dbContextProvider) 
    { 
    } 
 
    /// <summary> 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="materialNo"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public virtual async Task<WmsInOutStockRecord> FindByNameAsync(string materialNo, CancellationToken cancellationToken = default) 
    { 
        return await (await GetDbSetAsync()) 
            .IncludeDetails() 
            .Where(x => !x.IsDeleted) 
            .OrderBy(t => t.Sort) 
            .FirstOrDefaultAsync(t => t.MaterialNo == materialNo, GetCancellationToken(cancellationToken)); 
    } 
 
    /// <summary> 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨å‡ºå…¥åº“记录表 
    /// </summary> 
    /// <param name="materialCode"></param> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    public async Task<bool> NameExistAsync(string materialCode, Guid? id = null) 
    { 
        return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.MaterialName == materialCode); 
    } 
 
    /// <summary> 
    /// èŽ·å–最大排序出入库记录表 
    /// </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> 
    /// èŽ·å–分页列表出入库记录表 
    /// </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<WmsInOutStockRecord>> GetListAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, 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(WmsInOutStockRecord.Sort) : sorting) 
            .PageBy(skipCount, maxResultCount) 
            .ToListAsync(GetCancellationToken(cancellationToken)); 
    } 
 
    /// <summary> 
    /// èŽ·å–总数出入库记录表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, 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<WmsInOutStockRecord>> WithDetailsAsync() 
    { 
        return (await GetQueryableAsync()) 
            .Where(x => !x.IsDeleted).IncludeDetails(); 
    } 
} 

 HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs

@@ -41,6 +41,7 @@
        builder.ConfigureWmsMaterialInfo();
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        builder.ConfigureWmsTask();

        /* Configure your own tables/entities inside here */


 HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506070902_InitialCreate6.Designer.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506054001_InitialCreate7.Designer.cs ÐÞ¸Ä
@@ -12,8 +12,8 @@
namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
    [DbContext(typeof(CMSPluginDbContext))]
    [Migration("20250506054001_InitialCreate7")]
    partial class InitialCreate7
    [Migration("20250506070902_InitialCreate6")]
    partial class InitialCreate6
    {
        protected override void BuildTargetModel(ModelBuilder modelBuilder)
        {
@@ -188,6 +188,9 @@
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");
@@ -195,6 +198,9 @@
                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<int>("Sort")
                        .HasColumnType("int");

                    b.HasKey("PlaceNo", "ContainerNo");

@@ -352,7 +358,7 @@
                    b.HasComment("托盘信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecords.WmsInOutStockRecord", b =>
            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
@@ -394,6 +400,10 @@
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
@@ -440,6 +450,10 @@
                        .HasColumnType("varchar(500)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")

 HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506070902_InitialCreate6.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506054001_InitialCreate7.cs ÐÞ¸Ä
@@ -5,7 +5,7 @@

namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
    public partial class InitialCreate7 : Migration
    public partial class InitialCreate6 : Migration
    {
        protected override void Up(MigrationBuilder migrationBuilder)
        {
@@ -17,6 +17,8 @@
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ContainerNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "托盘编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Sort = table.Column<int>(type: "int", nullable: false),
                    IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true),
                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
                        .Annotation("MySql:CharSet", "utf8mb4"),
@@ -64,6 +66,8 @@
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ToPlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "目标库位")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Sort = table.Column<int>(type: "int", nullable: false, comment: "排序"),
                    IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, comment: "是否禁用"),
                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
@@ -82,11 +86,6 @@
                },
                comment: "出入库记录表")
                .Annotation("MySql:CharSet", "utf8mb4");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsmaterialstocks_MaterialNo",
                table: "scms_wmsmaterialstocks",
                column: "MaterialNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmscontainerplaces_ContainerNo",
@@ -141,10 +140,6 @@

            migrationBuilder.DropTable(
                name: "scms_wmsinoutstockrecords");

            migrationBuilder.DropIndex(
                name: "IX_scms_wmsmaterialstocks_MaterialNo",
                table: "scms_wmsmaterialstocks");
        }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506074429_InitialCreate7.Designer.cs

copy from HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506054001_InitialCreate7.Designer.cs
copy to HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506074429_InitialCreate7.Designer.cs
Îļþ´Ó HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506054001_InitialCreate7.Designer.cs ¸´ÖÆ
@@ -12,7 +12,7 @@
namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
    [DbContext(typeof(CMSPluginDbContext))]
    [Migration("20250506054001_InitialCreate7")]
    [Migration("20250506074429_InitialCreate7")]
    partial class InitialCreate7
    {
        protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -188,6 +188,9 @@
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");
@@ -195,6 +198,9 @@
                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<int>("Sort")
                        .HasColumnType("int");

                    b.HasKey("PlaceNo", "ContainerNo");

@@ -352,7 +358,7 @@
                    b.HasComment("托盘信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecords.WmsInOutStockRecord", b =>
            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
@@ -394,6 +400,10 @@
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
@@ -439,6 +449,10 @@
                        .HasMaxLength(500)
                        .HasColumnType("varchar(500)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
@@ -1191,6 +1205,169 @@

                    b.HasComment("仓库信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<int?>("Aisle")
                        .HasColumnType("int")
                        .HasComment("巷道");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("托盘编号");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<int?>("DodeviceId")
                        .HasColumnType("int")
                        .HasComment("堆垛机ID");

                    b.Property<int>("Dodevicetype")
                        .HasColumnType("int")
                        .HasComment("设备类型");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<int?>("IsNextTask")
                        .HasColumnType("int")
                        .HasComment("下个任务是否生成成功");

                    b.Property<bool>("IsRead")
                        .HasColumnType("tinyint(1)")
                        .HasComment("WCS是否可以读取");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("MutableParam1")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量1");

                    b.Property<string>("MutableParam2")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量2");

                    b.Property<string>("MutableParam3")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量3");

                    b.Property<int?>("SonTaskType")
                        .HasColumnType("int")
                        .HasComment("子任务类型");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourceOrderNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("来源单据号");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("起始库位");

                    b.Property<int>("TaskDodeviceStatus")
                        .HasColumnType("int")
                        .HasComment("设备任务状态");

                    b.Property<int>("TaskLevel")
                        .HasColumnType("int")
                        .HasComment("任务等级");

                    b.Property<string>("TaskNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("任务号");

                    b.Property<int>("TaskStatus")
                        .HasColumnType("int")
                        .HasComment("任务状态");

                    b.Property<int>("TaskType")
                        .HasColumnType("int")
                        .HasComment("任务类型");

                    b.Property<string>("ToPlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("目标库位");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo");

                    b.HasIndex("DodeviceId");

                    b.HasIndex("IsRead");

                    b.HasIndex("Sort");

                    b.HasIndex("SourceOrderNo");

                    b.HasIndex("SourcePlace");

                    b.HasIndex("TaskNo")
                        .IsUnique();

                    b.HasIndex("TaskStatus");

                    b.HasIndex("TaskType");

                    b.HasIndex("ToPlace");

                    b.ToTable("scms_wmstasks", (string)null);

                    b.HasComment("任务表");
                });
#pragma warning restore 612, 618
        }
    }

 HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250506074429_InitialCreate7.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,122 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;

#nullable disable

namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
    public partial class InitialCreate7 : Migration
    {
        protected override void Up(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.CreateTable(
                name: "scms_wmstasks",
                columns: table => new
                {
                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
                    TaskNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "任务号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    TaskType = table.Column<int>(type: "int", nullable: false, comment: "任务类型"),
                    TaskLevel = table.Column<int>(type: "int", nullable: false, comment: "任务等级"),
                    TaskStatus = table.Column<int>(type: "int", nullable: false, comment: "任务状态"),
                    ContainerNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "托盘编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    SourcePlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "起始库位")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ToPlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "目标库位")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Aisle = table.Column<int>(type: "int", nullable: true, comment: "巷道"),
                    DodeviceId = table.Column<int>(type: "int", nullable: true, comment: "堆垛机ID"),
                    Dodevicetype = table.Column<int>(type: "int", nullable: false, comment: "设备类型"),
                    TaskDodeviceStatus = table.Column<int>(type: "int", nullable: false, comment: "设备任务状态"),
                    IsRead = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "WCS是否可以读取"),
                    SonTaskType = table.Column<int>(type: "int", nullable: true, comment: "子任务类型"),
                    SourceOrderNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "来源单据号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    IsNextTask = table.Column<int>(type: "int", nullable: true, comment: "下个任务是否生成成功"),
                    MutableParam1 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "可变变量1")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MutableParam2 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "可变变量2")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MutableParam3 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "可变变量3")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Sort = table.Column<int>(type: "int", nullable: false, comment: "排序"),
                    IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, comment: "是否禁用"),
                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
                    CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
                    LastModifierId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    IsDeleted = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false),
                    DeleterId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    DeletionTime = table.Column<DateTime>(type: "datetime(6)", nullable: true)
                },
                constraints: table =>
                {
                    table.PrimaryKey("PK_scms_wmstasks", x => x.Id);
                },
                comment: "任务表")
                .Annotation("MySql:CharSet", "utf8mb4");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_ContainerNo",
                table: "scms_wmstasks",
                column: "ContainerNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_DodeviceId",
                table: "scms_wmstasks",
                column: "DodeviceId");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_IsRead",
                table: "scms_wmstasks",
                column: "IsRead");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_Sort",
                table: "scms_wmstasks",
                column: "Sort");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_SourceOrderNo",
                table: "scms_wmstasks",
                column: "SourceOrderNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_SourcePlace",
                table: "scms_wmstasks",
                column: "SourcePlace");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_TaskNo",
                table: "scms_wmstasks",
                column: "TaskNo",
                unique: true);

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_TaskStatus",
                table: "scms_wmstasks",
                column: "TaskStatus");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_TaskType",
                table: "scms_wmstasks",
                column: "TaskType");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_ToPlace",
                table: "scms_wmstasks",
                column: "ToPlace");
        }

        protected override void Down(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.DropTable(
                name: "scms_wmstasks");
        }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs

@@ -186,6 +186,9 @@
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");
@@ -193,6 +196,9 @@
                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<int>("Sort")
                        .HasColumnType("int");

                    b.HasKey("PlaceNo", "ContainerNo");

@@ -350,7 +356,7 @@
                    b.HasComment("托盘信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecords.WmsInOutStockRecord", b =>
            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
@@ -392,6 +398,10 @@
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
@@ -437,6 +447,10 @@
                        .HasMaxLength(500)
                        .HasColumnType("varchar(500)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
@@ -1189,6 +1203,169 @@

                    b.HasComment("仓库信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<int?>("Aisle")
                        .HasColumnType("int")
                        .HasComment("巷道");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("托盘编号");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<int?>("DodeviceId")
                        .HasColumnType("int")
                        .HasComment("堆垛机ID");

                    b.Property<int>("Dodevicetype")
                        .HasColumnType("int")
                        .HasComment("设备类型");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<int?>("IsNextTask")
                        .HasColumnType("int")
                        .HasComment("下个任务是否生成成功");

                    b.Property<bool>("IsRead")
                        .HasColumnType("tinyint(1)")
                        .HasComment("WCS是否可以读取");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("MutableParam1")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量1");

                    b.Property<string>("MutableParam2")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量2");

                    b.Property<string>("MutableParam3")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量3");

                    b.Property<int?>("SonTaskType")
                        .HasColumnType("int")
                        .HasComment("子任务类型");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourceOrderNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("来源单据号");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("起始库位");

                    b.Property<int>("TaskDodeviceStatus")
                        .HasColumnType("int")
                        .HasComment("设备任务状态");

                    b.Property<int>("TaskLevel")
                        .HasColumnType("int")
                        .HasComment("任务等级");

                    b.Property<string>("TaskNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("任务号");

                    b.Property<int>("TaskStatus")
                        .HasColumnType("int")
                        .HasComment("任务状态");

                    b.Property<int>("TaskType")
                        .HasColumnType("int")
                        .HasComment("任务类型");

                    b.Property<string>("ToPlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("目标库位");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo");

                    b.HasIndex("DodeviceId");

                    b.HasIndex("IsRead");

                    b.HasIndex("Sort");

                    b.HasIndex("SourceOrderNo");

                    b.HasIndex("SourcePlace");

                    b.HasIndex("TaskNo")
                        .IsUnique();

                    b.HasIndex("TaskStatus");

                    b.HasIndex("TaskType");

                    b.HasIndex("ToPlace");

                    b.ToTable("scms_wmstasks", (string)null);

                    b.HasComment("任务表");
                });
#pragma warning restore 612, 618
        }
    }

 HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs

@@ -41,6 +41,7 @@
        builder.ConfigureWmsMaterialInfo();
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        builder.ConfigureWmsTask();
        /* Configure your own tables/entities inside here */

        //builder.Entity<YourEntity>(b =>

 HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs

@@ -41,6 +41,7 @@
        builder.ConfigureWmsMaterialInfo();
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        builder.ConfigureWmsTask();

        /* Configure your own tables/entities inside here */


 HIAWms/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj

@@ -56,6 +56,12 @@
    </ItemGroup>

    <ItemGroup>
      <Reference Include="CmsQueryExtensions">
        <HintPath>..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
      </Reference>
    </ItemGroup>

    <ItemGroup>
      <Resource Include="Flows\50001_1.pfd">
        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      </Resource>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,188 @@
using Ao.Lang; 
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters; 
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
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> 
    /// å‡ºå…¥åº“记录表服务 
    /// </summary> 
    [ApiController] 
    [TypeFilter(typeof(CMSLanguageFilter))] 
    [TypeFilter(typeof(CMSUowActionFilter))] 
    [TypeFilter(typeof(CMSAuditActionFilter))] 
    [TypeFilter(typeof(CMSExceptionFilter))] 
    [Route("api/v{version:apiVersion}/HIAWms/[controller]")] 
    public class WmsInOutStockRecordController : ControllerBase 
    { 
        private readonly IWmsInOutStockRecordAppService _wmsInOutStockRecordAppService; 
 
        /// <summary> 
        /// Initializes a new instance of the <see cref="WmsInOutStockRecordController"/> class. 
        /// </summary> 
        /// <param name="wmsInOutStockRecordAppService">The wmsInOutStockRecord application service.</param> 
        public WmsInOutStockRecordController(IWmsInOutStockRecordAppService wmsInOutStockRecordAppService) 
        { 
            _wmsInOutStockRecordAppService = wmsInOutStockRecordAppService; 
        } 
 
        /// <summary> 
        /// èŽ·å–出入库记录表 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
        [HttpGet] 
        [Route("{id}")] 
        public virtual Task<WmsInOutStockRecordDto> GetAsync(Guid id) 
        { 
            return _wmsInOutStockRecordAppService.GetAsync(id); 
        } 
 
        /// <summary> 
        /// åˆ†é¡µèŽ·å–出入库记录表的列表. 
        /// </summary> 
        /// <param name="input">输入.</param> 
        /// <returns></returns> 
        [HttpGet] 
        [Route("Page")] 
        public virtual Task<PagedResultDto<WmsInOutStockRecordDto>> GetListAsync([FromQuery] GetWmsInOutStockRecordInput input) 
        { 
            return _wmsInOutStockRecordAppService.GetListAsync(input); 
        } 
 
        /// <summary> 
        /// åˆ›å»ºå‡ºå…¥åº“记录表 
        /// </summary> 
        /// <param name="input">输入.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpPost] 
        public virtual Task<WmsInOutStockRecordDto> CreateAsync(WmsInOutStockRecordCreateDto input) 
        { 
            return _wmsInOutStockRecordAppService.CreateAsync(input); 
        } 
 
        /// <summary> 
        /// æ›´æ–°å‡ºå…¥åº“记录表 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <param name="input">输入.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpPut] 
        [Route("{id}")] 
        public virtual Task<WmsInOutStockRecordDto> UpdateAsync(Guid id, WmsInOutStockRecordUpdateDto input) 
        { 
            return _wmsInOutStockRecordAppService.UpdateAsync(id, input); 
        } 
 
        /// <summary> 
        /// å…‹éš†å‡ºå…¥åº“记录表 
        /// </summary> 
        /// <param name="ids">Id集合.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpPost] 
        [Route("Clone")] 
        public virtual Task<List<WmsInOutStockRecordDto>> CloneAsync([FromBody] IEnumerable<Guid> ids) 
        { 
            return _wmsInOutStockRecordAppService.CloneAsync(ids); 
        } 
 
        /// <summary> 
        /// åˆ é™¤å‡ºå…¥åº“记录表 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpDelete] 
        [Route("{id}")] 
        public virtual Task DeleteAsync(Guid id) 
        { 
            return _wmsInOutStockRecordAppService.DeleteAsync(id); 
        } 
 
        /// <summary> 
        /// æ‰¹é‡åˆ é™¤å‡ºå…¥åº“记录表 
        /// </summary> 
        /// <param name="ids">The ids.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpDelete] 
        public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids) 
        { 
            return _wmsInOutStockRecordAppService.DeleteManyAsync(ids); 
        } 
 
        /// <summary> 
        /// è°ƒæ•´æŽ’序出入库记录表 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
        [HttpPut] 
        [Route("{id}/AdjustSort/{sort}")] 
        public virtual Task AdjustSortAsync(Guid id, int sort) 
        { 
            return _wmsInOutStockRecordAppService.AdjustSortAsync(id, sort); 
        } 
 
        /// <summary> 
        /// å¯¼å…¥å‡ºå…¥åº“记录表 
        /// </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 wmsInOutStockRecordRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsInOutStockRecordsImportModel.WmsInOutStockRecordImportModel>(stream, sheetName: "配置").ToList() : new(); 
 
            if (!wmsInOutStockRecordRows.Any()) 
            { 
                throw new UserFriendlyException("请检查导入的表格"); 
            } 
 
            await _wmsInOutStockRecordAppService.ImportAsync(new WmsInOutStockRecordsImportModel 
            { 
                WmsInOutStockRecords = wmsInOutStockRecordRows, 
            }); 
 
            return Ok(); 
        } 
 
        /// <summary> 
        /// å¯¼å‡ºå‡ºå…¥åº“记录表 
        /// </summary> 
        /// <returns></returns> 
        [HttpGet] 
        [Route("Export")] 
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsInOutStockRecordInput input) 
        { 
            input.MaxResultCount = int.MaxValue; 
            var exportData = await _wmsInOutStockRecordAppService.ExportAsync(input); 
            var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsInOutStockRecord导出模板.xlsx"); 
            if (!System.IO.File.Exists(templatePath)) 
            { 
                templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsInOutStockRecord导出模板.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/components/BaseQueryDrawer/BaseQueryDrawer.module.scss

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
.informationDrawerPosition {
  position: relative;
}
.informationDrawer {
  background: linear-gradient(180deg, #dee4ff 0%, #ffffff 40%, #ffffff 100%);
  box-shadow: 0px -4px 30px 1px rgba(0, 0, 0, 0.16);

  border-radius: 6px 6px 0px 0px;
  opacity: 1;
  border: 1px solid #f0f3fd;

  @keyframes iconFrames {
    0% {
      opacity: 1;
    }
    25% {
      opacity: 0.66;
    }
    50% {
      opacity: 0.33;
    }
    75% {
      opacity: 0.66;
    }

    100% {
      opacity: 1;
    }
  }
  .iconPosition {
    position: absolute;
    top: 38px;
    right: 111px;
    user-select: none;
    -webkit-user-drag: none;
    animation: iconFrames 2s infinite linear;
  }
  :global(.cs-drawer__header) {
    padding-top: 36px;
    .cs-drawer__close-btn {
      margin-top: -16px;
      font-size: 16px;
    }

    > span {
      font-size: 18px;
      font-family: Source Han Sans CN, Source Han Sans CN;
      font-weight: bold;
      color: #464e54;
      line-height: 0px;
    }
  }
  :global(.cs-drawer__close-btn) {
    margin-top: -16px;
    font-size: 16px;
  }
  :global(.cs-drawer__body) {
    padding: 30px;
    padding-top: 13px;
  }
}

.modal {
  width: var(--drawer-width);
  left: calc(100% - var(--drawer-width)) !important;
}

.csDialogFooter {
  padding: 0 18px;
  .csBaseBtn {
    width: 98px;
    height: 26px;
  }
  .dialogBtn {
    background: #efeded;
    color: #666666;
  }
}

 HIAWms/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,113 @@
import { computed, defineComponent, onMounted, ref } from 'vue'
import styles from './BaseQueryDrawer.module.scss'
import Icon from '../Icon/Icon'
//@ts-ignore
export default defineComponent<{
  [key: string]: any
}>({
  // @ts-ignore
  name: 'BaseDrawer',
  props: {
    // é®ç½©æ˜¯å¦å¯ç‚¹å‡»
    clickable: {
      type: Boolean,
      default: false,
    },
    title: {
      type: String,
      default: '',
    },
    width: {
      type: String,
      default: '',
    },
    // modelValue: {
    //   type: Boolean,
    //   default: false,
    // },
  },
  emits: ['close','reset', 'confirmQueryForBase', 'update:modelValue', 'open', 'beforeClose'],
  setup(props: any, { emit, slots, attrs }: any) {
    // const size = computed(() => {
    //   if (attrs.size.includes('px')) {
    //     return attrs.size
    //   }
    // })

    // const model = computed(() => {
    //   if (attrs.model.includes('')) {
    //     return attrs.model
    //   }
    // })

    return () => {
      return (
        <div
          class={styles.drawContent}
          //@ts-ignore
          // style={props.clickable ? { '--drawer-width': size.value } : {}}
        >
          <el-drawer
            // modal-class={props.clickable ? styles.modal : ''}
            class={{
              [styles.informationDrawer]: true,
              // [styles.informationDrawerPosition]: props.clickable,
            }}
            onOpen={() => emit('open')}
            onClose={() => emit('close')}
            v-slots={{
              footer() {
                return (
                  <div class={styles.csDialogFooter}>
                    <el-button
                      onClick={() => emit('close')}
                      type="info"
                      plain
                      class={{
                        [styles.dialogBtn]: true,
                        [styles.csBaseBtn]: true,
                      }}
                    >
                      å…³é—­
                    </el-button>
                    <el-button
                      onClick={() => emit('reset')}
                      type="info"
                      plain
                      class={{
                        [styles.dialogBtn]: true,
                        [styles.csBaseBtn]: true,
                      }}
                    >
                      é‡ç½®
                    </el-button>
                    <el-button
                      onClick={() => emit('confirmQueryForBase')}
                      type="primary"
                      class={{
                        [styles.csBaseBtn]: true,
                      }}
                    >
                      æŸ¥è¯¢
                    </el-button>
                  </div>
                )
              },
            }}
            {...attrs}
            title={props.title}
            size={props.width || attrs.size}
          >
            <Icon
              width={167}
              height={54}
              class={styles.iconPosition}
              icon="drawer_bg"
            />
            {slots.default?.()}
          </el-drawer>
        </div>
      )
    }
  },
})

 HIAWms/web/src/config/menu.ts

@@ -14,6 +14,13 @@
    "notPage": false
  },
  {
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
    "patchName": "WmsInOutStockRecord",
    "icon": "p",
    "notPage": false
  },
  {
    "name": "Wms托盘管理",
    "path": "/information-base/WmsContainer",
    "patchName": "WmsContainer",
@@ -50,6 +57,13 @@
    "icon": "p",
    "notPage": false
  },
  "WmsInOutStockRecord": {
    "name": "出入库记录",
    "path": "/information-base/WmsInOutStockRecord",
    "patchName": "WmsInOutStockRecord",
    "icon": "p",
    "notPage": false
  },
  "WmsContainer": {
    "name": "Wms托盘管理",
    "path": "/information-base/WmsContainer",

 HIAWms/web/src/widgets/WmsInOutStockRecord/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/WmsInOutStockRecord/Controllers/WmsInOutStockRecord.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,275 @@
import { ref, onMounted, reactive, Ref, nextTick, computed } from 'vue' 
import { injectModel } from '@/libs/Provider/Provider' 
import { WmsInOutStockRecord } from '../Models/WmsInOutStockRecord' 
import { ElMessage } from 'element-plus' 
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox' 
import { useFile } from './File' 
 
interface CurrentType { 
  row: any 
  index: number 
} 
export const useWmsInOutStockRecord = (props: any, ctx?: any) => { 
  const wmsInOutStockRecord = injectModel<WmsInOutStockRecord>('wmsInOutStockRecord') 
  const { exportFile } = useFile() 
  /** 
   * å¤´éƒ¨é…ç½® 
   */ 
  const headers = ref({}) 
  /** 
   * åŠ¨æ€åˆ—配置 
   */ 
  const wmsInOutStockRecordColumns = 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 wmsInOutStockRecord.cloneData([row.id]) 
    //     ElMessage.success('创建副本成功') 
    //     tableRef.value?.getList() 
    //   }, 
    //   divided: true, 
    //   icon: 'copy', 
    // }, 
    { 
      label: '删除', 
      fn: async (c: CurrentType) => { 
        const names = selection.value.map((item: { name: string }) => item.name) 
        ConfirmBox( 
          `是否删除${names.length ? names.join(',') : c.row.name}` 
        ).then(async () => { 
          const ids = selection.value.map((item: { id: string }) => item.id) 
          await wmsInOutStockRecord.deleteWmsInOutStockRecords(ids.length ? ids : [c.row.id]) 
          ElMessage.success('删除成功') 
          tableRef.value.getList() 
        }) 
      }, 
      icon: 'close', 
    }, 
  ] 
 
  const onCheck = (records: any) => { 
    selection.value = records 
  } 
 
  const onAddWmsInOutStockRecord = () => { 
    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 onConfirmWmsInOutStockRecord = 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/wmsInOutStockRecord/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, 
    wmsInOutStockRecordColumns, 
    paginationParams, 
    headers, 
    onBeforeUpload, 
    onError, 
    onSuccess, 
    openDetail, 
    onSearch, 
    onExport, 
    onRowClick, 
    onConfirmWmsInOutStockRecord, 
    onCheck, 
    onAddWmsInOutStockRecord, 
    onAdvancedQuery 
  } 
} 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,275 @@
import { 
  ref, 
  onMounted, 
  reactive, 
  computed, 
  Ref, 
  watch, 
  SetupContext, 
  h, 
} from 'vue' 
import { injectModel } from '@/libs/Provider/Provider' 
import { WmsInOutStockRecordDrawer } from '../Models/WmsInOutStockRecordDrawer' 
import { ElMessage } from 'element-plus' 
import isEqual from 'lodash/isEqual' 
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox' 
import { cloneDeep } from 'lodash' 
 
export const useWmsInOutStockRecordDrawer = (props: any, ctx?: any) => { 
  const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>('wmsInOutStockRecordDrawer') 
  /** 
   * ç”¨æ¥å¯¹æ¯”的初始化数据 
   */ 
  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: 'orderNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入单据编号', 
              rules: [{required: true, message: '单据编号不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
                }, 
                { 
                   label: '物料件号', 
                   prop: 'materialNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料件号', 
              rules: [{required: true, message: '物料件号不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '操作类型', 
                   prop: 'stockType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入操作类型', 
              rules: [{required: true, message: '操作类型不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '容器编号', 
                   prop: 'containerNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入容器编号', 
                }, 
                { 
                   label: '机型', 
                   prop: 'materialModel', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入机型', 
                }, 
                { 
                   label: '操作时间', 
                   prop: 'operateTime', 
                   type: 'datetimerange', 
                   el: 'date-picker', 
                   //disabled: disabled, 
                   placeholder: '请输入操作时间', 
                }, 
                { 
                   label: '备注', 
                   prop: 'remark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '物料ID', 
                   prop: 'materialId', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料ID', 
              rules: [{required: true, message: '物料ID不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务号', 
                   prop: 'taskNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入任务号', 
              rules: [{required: true, message: '任务号不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '起始库位', 
                   prop: 'sourcePlace', 
                   el: 'input', 
                   //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 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 = { 
      orderNo: formData.value.orderNo, 
materialName: formData.value.materialName, 
materialNo: formData.value.materialNo, 
stockType: formData.value.stockType, 
containerNo: formData.value.containerNo, 
materialModel: formData.value.materialModel, 
operateTime: formData.value.operateTime, 
remark: formData.value.remark, 
materialId: formData.value.materialId, 
taskNo: formData.value.taskNo, 
sourcePlace: formData.value.sourcePlace, 
toPlace: formData.value.toPlace,  
    } 
    if (!current.value) { 
      await wmsInOutStockRecordDrawer.addWmsInOutStockRecord(data) 
    } else { 
      const id = current.value.id 
      await wmsInOutStockRecordDrawer.updateWmsInOutStockRecord(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 stockTypeEnumEnum = await wmsInOutStockRecordDrawer.getWmsEnumData({ 
 EnumName: 'StockTypeEnum', 
}) 
updateFormItemOptions('stockType', stockTypeEnumEnum) 
 
  } 
  commonQueryEnumForFrom() 
  /** 
   * å¼¹çª—打开获取详情 
   */ 
  const onOpen = async () => { 
    if (current.value) { 
      const res = await wmsInOutStockRecordDrawer.getWmsInOutStockRecordDetail(current.value) 
 
      formData.value = { 
        orderNo: res.orderNo, 
materialName: res.materialName, 
materialNo: res.materialNo, 
stockType: res.stockType, 
containerNo: res.containerNo, 
materialModel: res.materialModel, 
operateTime: res.operateTime, 
remark: res.remark, 
materialId: res.materialId, 
taskNo: res.taskNo, 
sourcePlace: res.sourcePlace, 
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/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,281 @@
import { 
  ref, 
  onMounted, 
  reactive, 
  computed, 
  Ref, 
  watch, 
  SetupContext, 
  h, 
} from 'vue' 
import { injectModel } from '@/libs/Provider/Provider' 
import { WmsInOutStockRecordDrawer } from '../Models/WmsInOutStockRecordDrawer' 
import { ElMessage } from 'element-plus' 
import isEqual from 'lodash/isEqual' 
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox' 
import { cloneDeep } from 'lodash' 
 
export const useWmsInOutStockRecordQueryDrawer = (props: any, ctx?: any) => { 
  const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>('WmsInOutStockRecordDrawer') 
  /** 
   * ç”¨æ¥å¯¹æ¯”的初始化数据 
   */ 
  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: 'orderNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入单据编号', 
                }, 
                { 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
                }, 
                { 
                   label: '物料件号', 
                   prop: 'materialNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料件号', 
                }, 
                { 
                   label: '操作类型', 
                   prop: 'stockType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入操作类型', 
                }, 
                { 
                   label: '容器编号', 
                   prop: 'containerNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入容器编号', 
                }, 
                { 
                   label: '机型', 
                   prop: 'materialModel', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入机型', 
                }, 
                { 
                   label: '操作时间', 
                   prop: 'operateTime', 
                   type: 'datetimerange', 
                   el: 'date-picker', 
                   //disabled: disabled, 
                   placeholder: '请输入操作时间', 
                }, 
                { 
                   label: '备注', 
                   prop: 'remark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '物料ID', 
                   prop: 'materialId', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料ID', 
                }, 
                { 
                   label: '任务号', 
                   prop: 'taskNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入任务号', 
                }, 
                { 
                   label: '起始库位', 
                   prop: 'sourcePlace', 
                   el: 'input', 
                   //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 = { 
      OrderNo: formData.value.OrderNo, 
MaterialName: formData.value.MaterialName, 
MaterialNo: formData.value.MaterialNo, 
StockType: formData.value.StockType, 
ContainerNo: formData.value.ContainerNo, 
MaterialModel: formData.value.MaterialModel, 
OperateTime: formData.value.OperateTime, 
Remark: formData.value.Remark, 
MaterialId: formData.value.MaterialId, 
TaskNo: formData.value.TaskNo, 
SourcePlace: formData.value.SourcePlace, 
ToPlace: formData.value.ToPlace,  
      materialCode: formData.value.materialCode, 
      materialName: formData.value.materialName, 
      purchaseType: formData.value.purchaseType, 
      materialType: formData.value.materialType, 
      primaryUnit: formData.value.primaryUnit, 
      standard: formData.value.standard, 
      outerDiameter: formData.value.outerDiameter, 
      wallThickness: formData.value.wallThickness, 
      materialQuality: formData.value.materialQuality, 
      length: formData.value.length, 
      isMainBranch: formData.value.isMainBranch, 
      factory: formData.value.factory, 
      certification: formData.value.certification, 
      remark: formData.value.remark, 
    } 
    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.OrderNo = '' 
formData.value.MaterialName = '' 
formData.value.MaterialNo = '' 
formData.value.StockType = '' 
formData.value.ContainerNo = '' 
formData.value.MaterialModel = '' 
formData.value.OperateTime = '' 
formData.value.Remark = '' 
formData.value.MaterialId = '' 
formData.value.TaskNo = '' 
formData.value.SourcePlace = '' 
formData.value.ToPlace = ''  
    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'); 
  } 
 
  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 stockTypeEnumEnum = await wmsInOutStockRecordDrawer.getWmsEnumData({ 
 EnumName: 'StockTypeEnum', 
}) 
updateFormItemOptions('stockType', stockTypeEnumEnum) 
 
  } 
  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/WmsInOutStockRecord/Models/Service/WmsInOutStockRecord.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
import { Base } from '@/libs/Base/Base'
const request = Base.request

/**
 * æ·»åŠ 
 * @returns
 */
export const addWmsInOutStockRecord = (data: any) => {
  return request.post('/api/v1/HIAWms/wmsInOutStockRecord', data)
}

/**
 * æ‰¹é‡åˆ é™¤
 * @returns
 */
export const deleteWmsInOutStockRecord = (ids: string[]) => {
  return request({
    data: ids,
    url: '/api/v1/HIAWms/wmsInOutStockRecord',
    method: 'delete',
  })
}

/**
 * å…‹éš†
 * @returns
 */
export const cloneData = (data: any) => {
  return request.post('/api/v1/HIAWms/wmsInOutStockRecord/clone', data)
}

 HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecordDrawer.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
import { Base } from '@/libs/Base/Base'
const request = Base.request

/**
 * æ·»åŠ 
 * @returns
 */
export const addWmsInOutStockRecord = (data: any) => {
  return request.post('/api/v1/HIAWms/wmsInOutStockRecord', data)
}

/**
 * èŽ·å–详情
 * @returns
 */
export const getWmsInOutStockRecord = (id: string) => {
  return request.get(`/api/v1/HIAWms/wmsInOutStockRecord/${id}`)
}

/**
 * æ›´æ–°
 * @returns
 */
export const updateWmsInOutStockRecord = (id: string, data: Record<string, any>) => {
  return request.put(`/api/v1/HIAWms/wmsInOutStockRecord/${id}`, data)
}

/**
 * èŽ·å–枚举
 * @returns
 */
export const getWmsEnumData = (data: any) => {
  return request.post('/api/v1/HIAWms/WmsEnum', data)
}

 HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecordQueryDrawer.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
import { Base } from '@/libs/Base/Base' 
const request = Base.request 
 
/** 
 * æ·»åŠ  
 * @returns 
 */ 
export const addWmsInOutStockRecord = (data: any) => { 
  return request.post('/api/v1/HIAWms/wmsInOutStockRecord', data) 
} 
 
/** 
 * èŽ·å–详情 
 * @returns 
 */ 
export const getWmsInOutStockRecord = (id: string) => { 
  return request.get(`/api/v1/HIAWms/wmsInOutStockRecord/${id}`) 
} 
 
/** 
 * æ›´æ–° 
 * @returns 
 */ 
export const updateWmsInOutStockRecord = (id: string, data: Record<string, any>) => { 
  return request.put(`/api/v1/HIAWms/wmsInOutStockRecord/${id}`, data) 
} 
 
/** 
 * èŽ·å–枚举 
 * @returns 
 */ 
export const getWmsEnumData = (data: any) => { 
  return request.post('/api/v1/HIAWms/WmsEnum', data) 
} 
 

 HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecord.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
import { Base } from '@/libs/Base/Base'
import {
  deleteWmsInOutStockRecord,
  addWmsInOutStockRecord,
  cloneData,
} from './Service/WmsInOutStockRecord'

export class WmsInOutStockRecord extends Base<{ [key: string]: any }> {
  constructor() {
    super({
      data: [],
    })
  }
  onMounted() {}
  /**
   * åˆ é™¤
   * @param id
   * @returns
   */
  async deleteWmsInOutStockRecords(ids: string[]) {
    return deleteWmsInOutStockRecord(ids)
  }

  /**
   * æ·»åŠ æ•°æ®
   * @param data
   * @returns
   */
  addWmsInOutStockRecord(data: Record<string, any>) {
    return addWmsInOutStockRecord(data)
  }

  /**
   * å…‹éš†
   * @param ids
   * @returns
   */
  cloneData(ids: string[]) {
    return cloneData(ids)
  }
}

 HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordDrawer.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import { Base } from '@/libs/Base/Base'
import {
  addWmsInOutStockRecord,
  getWmsInOutStockRecord,
  updateWmsInOutStockRecord,
  getWmsEnumData,
} from './Service/WmsInOutStockRecordDrawer'
import { useGlobalState } from '@/libs/Store/Store'

export class WmsInOutStockRecordDrawer extends Base<{ [key: string]: any }> {
  constructor() {
    super({
      data: [],
      wmsMaterial: {},
    })
  }

  /**
   * æ·»åŠ 
   * @param data
   */
  async addWmsInOutStockRecord(data: Record<string, any>) {
    return addWmsInOutStockRecord(data)
  }
  /**
   * æ›´æ–°
   * @param data
   */
  async updateWmsInOutStockRecord(id: string, data: Record<string, any>) {
    return updateWmsInOutStockRecord(id, data)
  }

  /**
   * èŽ·å–详情
   */
  async getWmsInOutStockRecordDetail(current: any, id?: string) {
    return getWmsInOutStockRecord(id || current?.id)
  }

  //  èŽ·å–枚举值
  async getWmsEnumData(data: Record<string, any>) {
    return getWmsEnumData(data)
  }
}

 HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordQueryDrawer.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import { Base } from '@/libs/Base/Base' 
import { 
  addWmsInOutStockRecord, 
  getWmsInOutStockRecord, 
  updateWmsInOutStockRecord, 
  getWmsEnumData, 
} from './Service/WmsInOutStockRecordQueryDrawer' 
import { useGlobalState } from '@/libs/Store/Store' 
 
export class WmsInOutStockRecordQueryDrawer extends Base<{ [key: string]: any }> { 
  constructor() { 
    super({ 
      data: [], 
      wmsMaterial: {}, 
    }) 
  } 
 
  /** 
   * æ·»åŠ  
   * @param data 
   */ 
  async addWmsInOutStockRecord(data: Record<string, any>) { 
    return addWmsInOutStockRecord(data) 
  } 
  /** 
   * æ›´æ–° 
   * @param data 
   */ 
  async updateWmsInOutStockRecord(id: string, data: Record<string, any>) { 
    return updateWmsInOutStockRecord(id, data) 
  } 
 
  /** 
   * èŽ·å–详情 
   */ 
  async getWmsInOutStockRecordDetail(current: any, id?: string) { 
    return getWmsInOutStockRecord(id || current?.id) 
  } 
 
  //  èŽ·å–枚举值 
  async getWmsEnumData(data: Record<string, any>) { 
    return getWmsEnumData(data) 
  } 
} 

 HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordDrawer/WmsInOutStockRecordDrawer.module.scss

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
.drawer { 
  width: 800px; 
} 

 HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordDrawer/WmsInOutStockRecordDrawer.tsx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
import { SetupContext, defineComponent } from 'vue' 
import BaseDrawer from '@/components/BaseDrawer/BaseDrawer' 
import styles from './WmsInOutStockRecordDrawer.module.scss' 
import { useWmsInOutStockRecordDrawer } from '../../../../Controllers/WmsInOutStockRecordDrawer.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, 
    } = useWmsInOutStockRecordDrawer(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/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordQueryDrawer/WmsInOutStockRecordQueryDrawer.module.scss

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
.drawer { 
  width: 800px; 
} 

 HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordQueryDrawer/WmsInOutStockRecordQueryDrawer.tsx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
/* 
 * ç‰©æ–™åŸºç¡€ä¿¡æ¯æŸ¥è¯¢å¼¹å‡ºæ¡† 
*/ 
import { SetupContext, defineComponent } from 'vue' 
import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer' 
import styles from './WmsInOutStockRecordQueryDrawer.module.scss' 
import { useWmsInOutStockRecordQueryDrawer } from '../../../../Controllers/WmsInOutStockRecordQueryDrawer.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, 
    } = useWmsInOutStockRecordQueryDrawer(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/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/Config.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
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: '', 
},  
] 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,113 @@
.wmsInOutStockRecordContent { 
  width: 100%; 
  height: 100%; 
 
  .wmsInOutStockRecordList { 
    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/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,308 @@
import { computed, defineComponent, onMounted, reactive, ref } from 'vue' 
import type { Ref } from 'vue' 
import BaseTable from '@/components/Table/Table' 
import styles from './WmsInOutStockRecord.module.scss' 
import { useWmsInOutStockRecord } from '../../../Controllers/WmsInOutStockRecord' 
import IconButton from '@/components/IconButton/IconButton' 
import WmsInOutStockRecordDrawer from '../Dialog/WmsInOutStockRecordDrawer/WmsInOutStockRecordDrawer' 
import WmsInOutStockRecordQueryDrawer from '../Dialog/WmsInOutStockRecordQueryDrawer/WmsInOutStockRecordQueryDrawer' 
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/WmsInOutStockRecord/Models/Service/WmsInOutStockRecordDrawer' 
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: 'WmsInOutStockRecord', 
  directives: { 
    permission: vPermission, 
  }, 
  setup(props, ctx) { 
    const { 
      dataSource, 
      contextMenu, 
      dialogConfig, 
      dialogConfigForQuery, 
      tableRef, 
      current, 
      search, 
      sort, 
      headers, 
      onError, 
      onSearch, 
      onRowClick, 
      onConfirmWmsInOutStockRecord, 
      onCheck, 
      onAddWmsInOutStockRecord, 
      onAdvancedQuery, 
      onExport, 
      openDetail, 
      onSuccess, 
      onBeforeUpload, 
    } = useWmsInOutStockRecord(props, ctx) 
 
    //定义高级查询引用 
   const wmsInOutStockRecordQueryDrawerRef=ref(null); 
    // æ–°å¢žçš„查询条件 
    const queryForm = ref({ 
      searchVal: '', 
      str_searchFormInputAttrs:[] 
    }) 
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
     'MaterialNo', 'MaterialName', 'Remark' 
    ]); 
    const searchFormInputAttrs_Placeholder = ref('请输入物料编码/物料名称/备注'); 
     
 
    // åŠ¨æ€æžšä¸¾é€‰é¡¹ 
    const enumOptions = reactive({ 
      stockType: [] as Array<{label: string; value: any }>,  
    }) 
 
    // èŽ·å–枚举数据 
    const fetchEnumData = async () => { 
      try { 
        const stockTypeEnumData = await getWmsEnumData({ 
 EnumName: 'StockTypeEnum', 
}) 
enumOptions.stockType = stockTypeEnumData.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.wmsInOutStockRecordList]: true, 
          }} 
        > 
          <BaseTable 
            ref={tableRef} 
            url={url} 
            sortUrlTpl="/api/v1/HIAWms/wmsInOutStockRecord/{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.wmsInOutStockRecordContent}> 
          {/* æ·»åŠ /编辑 */} 
          <WmsInOutStockRecordDrawer 
            v-model={dialogConfig.visible} 
            title={dialogConfig.title} 
            row={current.value} 
            sort={sort.value} 
            onConfirm={onConfirmWmsInOutStockRecord} 
          /> 
          {/* é«˜çº§æŸ¥è¯¢ */} 
          <WmsInOutStockRecordQueryDrawer 
            ref="wmsInOutStockRecordQueryDrawerRef" 
            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="wmsInOutStockRecord-add" 
                icon="add-p" 
                onClick={onAddWmsInOutStockRecord} 
                type="primary" 
              > 
                æ·»åŠ  
              </IconButton> 
              <el-divider direction="vertical" /> 
 
              <el-divider direction="vertical" /> 
              <el-upload 
                v-permission="wmsInOutStockRecord-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/wmsInOutStockRecord/import" 
              > 
                <IconButton icon="in">导入</IconButton> 
              </el-upload> 
 
              <IconButton 
                v-permission="wmsInOutStockRecord-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="wmsInOutStockRecord-add" 
                icon="search" 
                onClick={onAdvancedQuery} 
                type="primary" 
              > 
                é«˜çº§æŸ¥è¯¢ 
              </IconButton> 
            </ElFormItem> 
          </div> 
 
          <RenderBaseTable 
            url="/api/v1/HIAWms/wmsInOutStockRecord/page" 
            dataSource={dataSource} 
            isChecked={true} 
            isDrag={true} 
          /> 
        </div> 
      ) 
    } 
  }, 
}) 

 HIAWms/web/src/widgets/WmsInOutStockRecord/Views/WmsInOutStockRecord.module.scss

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
.WmsInOutStockRecord { 
  background-color: #fff; 
  border-radius: 5px 5px 0 0; 
  width: 100%; 
  height: 100%; 
  border: 1px solid #dbdbdb; 
} 

 HIAWms/web/src/widgets/WmsInOutStockRecord/Views/WmsInOutStockRecord.tsx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
import {
  Component,
  DefineComponent,
  defineComponent,
  markRaw,
  ref,
  SetupContext,
  onMounted,
} from 'vue'
import styles from './WmsInOutStockRecord.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: 'WmsInOutStockRecord', label: '出入库记录' }]

export default defineComponent({
  name: 'WmsInOutStockRecord',

  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 WmsInOutStockRecord = markRaw(module.default)
        const foundLabel =
          nameToLabelMap.find((item) => item.name === name)?.label || name
        tabData.value.push({
          label: foundLabel,
          name,
          component: WmsInOutStockRecord,
        })
      }
    }

    initTableData()

    return () => {
      return (
        <div class={styles.WmsInOutStockRecord}>
          <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['WmsInOutStockRecord'] = r)}
                  ></Widget>
                </TabPane>
              )
            })}
          </Tab>
        </div>
      )
    }
  },
})

 HIAWms/web/src/widgets/WmsInOutStockRecord/Views/config/WmsInOutStockRecord.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
{
  "name": "WmsInOutStockRecord"
}

 HIAWms/web/src/widgets/WmsInOutStockRecord/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 = { 
  'wmsInOutStockRecord-list': '列表-列表', 
  'wmsInOutStockRecord-add': '列表-添加', 
  'wmsInOutStockRecord-import': '列表-导入', 
  'wmsInOutStockRecord-output': '列表-输出', 
} 

 HIAWms/web/src/widgets/WmsInOutStockRecord/index.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
import WmsInOutStockRecord from './Views/WmsInOutStockRecord' 
import Setting from '@/components/Setting/Setting' 
import { provider } from '@/provider/index' 
import p from '../../assets/svg/p.svg' 
 
export default { 
  is: 'WmsInOutStockRecord', 
  name: '出入库记录', 
  category: 'run', 
  icon: p, 
  authorizationRequired: false, 
  canvasView: provider(WmsInOutStockRecord), 
  settingsView: Setting, 
} 

 HIAWms/web/src/widgets/WmsInOutStockRecord/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 WmsInOutStockRecordBaseType { 
  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 
}