修改生成器及出入库记录页面

zs

2025-05-07 4456f43c6c73185a9f7ce46cdcdf94ab2053f02e

修改生成器及出入库记录页面

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

@@ -4,7 +4,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;

/// <summary> 
/// å‡ºå…¥åº“记录表查询参数 
/// å‡ºå…¥åº“记录查询参数 
/// </summary> 
public class GetWmsInOutStockRecordInput : ExtensiblePagedAndSortedResultRequestDto
{
@@ -108,7 +108,7 @@
    /// </summary>
    //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
    [HighSearchRangeAttribute]
    public string OperateTime { get; set; }
        public List<string> OperateTime { get; set; }


    /// <summary>
@@ -162,6 +162,26 @@
    public SearchFilterModeEnum ToPlace_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

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

        /// <summary>
        /// æŽ’序-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

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

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
    /// 
    /// </summary>
    //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§

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

@@ -1,7 +1,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表创建参数对象 
/// å‡ºå…¥åº“记录创建参数对象 
/// </summary> 
public class WmsInOutStockRecordCreateDto : WmsInOutStockRecordCreateOrUpdateDtoBase 
{ 

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

@@ -5,7 +5,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表创建或更新基类 
/// å‡ºå…¥åº“记录创建或更新基类 
/// </summary> 
public abstract class WmsInOutStockRecordCreateOrUpdateDtoBase : ExtensibleEntityDto 
{ 
@@ -70,6 +70,16 @@
        public string? ToPlace { get; set; }

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

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

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

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

@@ -8,7 +8,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表数据参数对象 
/// å‡ºå…¥åº“记录数据参数对象 
/// </summary> 
public  class WmsInOutStockRecordDto:  ExtensibleEntityDto<Guid>, IHasConcurrencyStamp 
{ 
@@ -83,6 +83,16 @@
        public string? ToPlace { get; set; }

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

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

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

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

@@ -1,11 +1,12 @@
using MiniExcelLibs.Attributes; 
using System.ComponentModel.DataAnnotations; 
using System; 
using System.ComponentModel; 
using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表导出模型 
/// å‡ºå…¥åº“记录导出模型 
/// </summary> 
public  class WmsInOutStockRecordExportModel 
{ 
@@ -81,6 +82,18 @@
        [ExcelColumn(Name = "目标库位", Width = 25)]
        public string ToPlace { get; set; }

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

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        [ExcelColumn(Name = "是否禁用", Width = 25)]
        public bool? IsDisabled { get; set; }

 
 
    public Dictionary<string, object> GetExportData() 

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

@@ -2,7 +2,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表更新参数对象 
/// å‡ºå…¥åº“记录更新参数对象 
/// </summary> 
public class WmsInOutStockRecordUpdateDto : WmsInOutStockRecordCreateOrUpdateDtoBase, IHasConcurrencyStamp 
{ 

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

@@ -2,7 +2,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord 
{ 
    /// <summary> 
    /// å‡ºå…¥åº“记录表导入模型 
    /// å‡ºå…¥åº“记录导入模型 
    /// </summary> 
    public class WmsInOutStockRecordsImportModel 
    { 
@@ -20,7 +20,7 @@
        } 
 
        /// <summary> 
        /// å‡ºå…¥åº“记录表导入模型 
        /// å‡ºå…¥åº“记录导入模型 
        /// </summary> 
        public class WmsInOutStockRecordImportModel : WmsInOutStockRecordExportModel 
        { 

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

@@ -4,26 +4,26 @@
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> 
@@ -31,14 +31,14 @@
    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> 

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

@@ -1,8 +1,8 @@
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.WmsInOutStockRecord;
using CmsQueryExtensions;
using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord; 
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;
using Volo.Abp;
@@ -14,33 +14,33 @@
namespace CMS.Plugin.HIAWms.Application.Implements;

/// <summary> 
/// å‡ºå…¥åº“记录表应用服务 
/// å‡ºå…¥åº“记录应用服务 
/// </summary> 
public class WmsInOutStockRecordAppService : CMSPluginAppService, IWmsInOutStockRecordAppService
{
    private readonly IWmsInOutStockRecordRepository _wmsInOutStockRecordRepository;
    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)
    public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository _WmsInOutStockRecordRepository) 
    {
        _wmsInOutStockRecordRepository = 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));
        return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(await wmsInOutStockRecordRepository.GetAsync(id)); 
    }

    /// <summary> 
    /// åˆ†é¡µèŽ·å–出入库记录表 
    /// åˆ†é¡µèŽ·å–出入库记录 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
@@ -60,8 +60,8 @@

        #endregion

        var count = await _wmsInOutStockRecordRepository.GetCountAsync(whereConditions);
        var list = await _wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
        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));
    }
@@ -90,7 +90,7 @@
    }

    /// <summary> 
    /// æ–°å»ºå‡ºå…¥åº“记录表 
    /// æ–°å»ºå‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
@@ -99,16 +99,20 @@
    {
        await CheckCreateOrUpdateDtoAsync(input);

        var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.Id); 
        if (exist) 
        { 
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Id]); 
        } 


        var maxSort = await _wmsInOutStockRecordRepository.GetMaxSortAsync();
        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);
        await wmsInOutStockRecordRepository.InsertAsync(insertObj); 

        if (input.Sort.HasValue && insertObj.Sort != maxSort)
        {
@@ -119,7 +123,7 @@
    }

    /// <summary> 
    /// æ›´æ–°å‡ºå…¥åº“记录表 
    /// æ›´æ–°å‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="input"></param> 
@@ -129,8 +133,12 @@
    {
        await CheckCreateOrUpdateDtoAsync(input);

        var updateObj = await _wmsInOutStockRecordRepository.GetAsync(id);

        var updateObj = await wmsInOutStockRecordRepository.GetAsync(id); 
        var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.Id, updateObj.Id); 
        if (exist) 
        { 
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Id]); 
        } 

        updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
@@ -147,15 +155,16 @@
        updateObj.TaskNo = input.TaskNo;
        updateObj.SourcePlace = input.SourcePlace;
        updateObj.ToPlace = input.ToPlace;
        updateObj.IsDisabled = input.IsDisabled;


        await _wmsInOutStockRecordRepository.UpdateAsync(updateObj);
        await wmsInOutStockRecordRepository.UpdateAsync(updateObj); 

        return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(updateObj);
    }

    /// <summary> 
    /// å…‹éš†å‡ºå…¥åº“记录表 
    /// å…‹éš†å‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
@@ -195,17 +204,17 @@
    }

    /// <summary> 
    /// åˆ é™¤å•ä¸ªå‡ºå…¥åº“记录表 
    /// åˆ é™¤å•ä¸ªå‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    public virtual Task DeleteAsync(Guid id)
    {
        return _wmsInOutStockRecordRepository.DeleteAsync(id);
        return wmsInOutStockRecordRepository.DeleteAsync(id); 
    }

    /// <summary> 
    /// åˆ é™¤å¤šä¸ªå‡ºå…¥åº“记录表 
    /// åˆ é™¤å¤šä¸ªå‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
@@ -218,14 +227,14 @@
    }

    /// <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));
        var list = await wmsInOutStockRecordRepository.GetListAsync(null, nameof(WmsInOutStockRecord.Sort)); 
        if (list != null && list.Any())
        {
            var initSort = 1;
@@ -252,22 +261,130 @@
            }
        }

        await _wmsInOutStockRecordRepository.UpdateManyAsync(list);
        await wmsInOutStockRecordRepository.UpdateManyAsync(list); 
    }

    /// <summary> 
    /// å¯¼å…¥å‡ºå…¥åº“记录表 
    /// å¯¼å…¥å‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public async Task ImportAsync(WmsInOutStockRecordsImportModel input)
    {
        Check.NotNull(input, nameof(input)); 

        var wmsInOutStockRecordCreateDtos = new List<(int RowIndex, WmsInOutStockRecordCreateDto Item)>(); 
        var wmsInOutStockRecordUpdateDtos = new List<(int RowIndex, Guid Id, WmsInOutStockRecordUpdateDto Item)>(); 
        var importItems = input.WmsInOutStockRecords; 
 
        if (importItems != null && importItems.Any()) 
        { 
            #region å¯¼å…¥æ ¡éªŒ 
 
            // åˆ¤æ–­åç§°æ˜¯å¦é‡å¤ï¼Œå¹¶è¾“出第几行重复 
            var duplicateWmsInOutStockRecords = importItems.GroupBy(x => x.Id).Where(x => x.Count() > 1).ToList(); 
            if (duplicateWmsInOutStockRecords?.Any() == true) 
            { 
                var duplicateWmsInOutStockRecordMsgs = duplicateWmsInOutStockRecords.Select(x => $"第 {string.Join(",", x.Select(x => x.RowIndex))} è¡Œï¼š{x.Key}  åç§°é‡å¤"); 
                var errorMsg = $"导入失败！配置， {string.Join(",", duplicateWmsInOutStockRecordMsgs)}，终止导入"; 
                throw new UserFriendlyException(errorMsg); 
            } 
 
            #endregion 
 
            foreach (var impItem in importItems) 
            { 
                if (impItem.Id.IsNullOrWhiteSpace()) 
                { 
                    continue; 
                } 
 
                if (impItem.Id.IsNullOrWhiteSpace()) 
                { 
                    var errorMsg = $"导入失败！配置，第{impItem.RowIndex}行：WmsInOutStockRecord名称不能为空"; 
                    throw new UserFriendlyException(errorMsg); 
                } 
 
                var oldWmsInOutStockRecord = await wmsInOutStockRecordRepository.FindByNameAsync(impItem.Id); 
                if (oldWmsInOutStockRecord != null) 
                { 
                    var wmsInOutStockRecordUpdateDto = new WmsInOutStockRecordUpdateDto 
                    { 
                        OrderNo = impItem.OrderNo,
MaterialName = impItem.MaterialName,
MaterialNo = impItem.MaterialNo,
StockType = impItem.StockType,
ContainerNo = impItem.ContainerNo,
MaterialModel = impItem.MaterialModel,
OperateTime = impItem.OperateTime,
Remark = impItem.Remark,
MaterialId = impItem.MaterialId,
TaskNo = impItem.TaskNo,
SourcePlace = impItem.SourcePlace,
ToPlace = impItem.ToPlace,
IsDisabled = impItem.IsDisabled,
 
                    }; 
 
                    wmsInOutStockRecordUpdateDtos.Add((impItem.RowIndex, oldWmsInOutStockRecord.Id, wmsInOutStockRecordUpdateDto)); 
                } 
                else 
                { 
                    var wmsInOutStockRecordCreateDto = new WmsInOutStockRecordCreateDto 
                    { 
                        OrderNo = impItem.OrderNo,
MaterialName = impItem.MaterialName,
MaterialNo = impItem.MaterialNo,
StockType = impItem.StockType,
ContainerNo = impItem.ContainerNo,
MaterialModel = impItem.MaterialModel,
OperateTime = impItem.OperateTime,
Remark = impItem.Remark,
MaterialId = impItem.MaterialId,
TaskNo = impItem.TaskNo,
SourcePlace = impItem.SourcePlace,
ToPlace = impItem.ToPlace,
IsDisabled = impItem.IsDisabled,
 
                    }; 
 
                    wmsInOutStockRecordCreateDtos.Add((impItem.RowIndex, wmsInOutStockRecordCreateDto)); 
                } 
            } 
        } 
 
        // æ–°å¢ž 
        foreach (var wmsInOutStockRecordDto in wmsInOutStockRecordCreateDtos) 
        { 
            try 
            { 
                await CreateAsync(wmsInOutStockRecordDto.Item); 
            } 
            catch (Exception e) 
            { 
                var errorMsg = $"导入失败！配置，第{wmsInOutStockRecordDto.RowIndex}行：{e.Message}，终止导入"; 
                throw new UserFriendlyException(errorMsg); 
            } 
        } 
 
        // æ›´æ–° 
        foreach (var wmsInOutStockRecordDto in wmsInOutStockRecordUpdateDtos) 
        { 
            try 
            { 
                await UpdateAsync(wmsInOutStockRecordDto.Id, wmsInOutStockRecordDto.Item); 
            } 
            catch (Exception e) 
            { 
                var errorMsg = $"导入失败！配置，第{wmsInOutStockRecordDto.RowIndex}行：{e.Message}，终止导入"; 
                throw new UserFriendlyException(errorMsg); 
            } 
        } 
    }

    /// <summary> 
    /// å¯¼å‡ºå‡ºå…¥åº“记录表 
    /// å¯¼å‡ºå‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
@@ -288,7 +405,7 @@
        #endregion


        var list = await _wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
        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>
@@ -296,12 +413,12 @@
            ["配置"] = ExportHelper.ConvertListToExportData(result),
        };

        var fileName = result.Count > 1 ? "WmsInOutStockRecord列表" : result.Count == 1 ? result[0]?.MaterialName : "WmsInOutStockRecord模版";
        var fileName = result.Count > 1 ? "出入库记录列表" : result.Count == 1 ? result[0]?.Id : "WmsInOutStockRecord模版"; 
        return (sheets, fileName);
    }

    /// <summary> 
    /// æ ¡éªŒå‡ºå…¥åº“记录表，当新建或更新时 
    /// æ ¡éªŒå‡ºå…¥åº“记录，当新建或更新时 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
using AutoMapper; 
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord; 
using Volo.Abp.ObjectExtending; 
 
namespace CMS.Plugin.HIAWms.Application.MapperProfiles; 
 
/// <summary> 
/// å‡ºå…¥åº“记录AutoMapper配置 
/// </summary> 
/// <seealso cref="AutoMapper.Profile" /> 
public class WmsInOutStockRecordAutoMapperProfile : Profile 
{ 
    /// <summary> 
    /// Initializes a new instance of the <see cref="WmsInOutStockRecordAutoMapperProfile"/> class. 
    /// </summary> 
    public WmsInOutStockRecordAutoMapperProfile() 
    { 
        /* You can configure your AutoMapper mapping configuration here. 
         * Alternatively, you can split your mapping configurations 
         * into multiple profile classes for a better organization. */ 
        CreateMap<WmsInOutStockRecord, WmsInOutStockRecordDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 
        CreateMap<WmsInOutStockRecordCreateDto, WmsInOutStockRecord>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 
        CreateMap<GetWmsInOutStockRecordInput, WmsInOutStockRecord>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 
    } 
} 

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

@@ -5,34 +5,34 @@
namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表仓储 
/// å‡ºå…¥åº“记录仓储 
/// </summary> 
public interface IWmsInOutStockRecordRepository : IBasicRepository<WmsInOutStockRecord, Guid> 
{ 
    /// <summary> 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾å‡ºå…¥åº“记录表 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾å‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="materialNo"></param> 
    /// <param name="name"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    Task<WmsInOutStockRecord> FindByNameAsync(string materialNo, CancellationToken cancellationToken = default); 
    Task<WmsInOutStockRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default); 
 
    /// <summary> 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨å‡ºå…¥åº“记录表 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨å‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="materialNo"></param> 
    /// <param name="name"></param> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    Task<bool> NameExistAsync(string materialNo, Guid? id = null); 
    Task<bool> NameExistAsync(string name, Guid? id = null); 
 
    /// <summary> 
    /// èŽ·å–最大排序出入库记录表 
    /// èŽ·å–最大排序出入库记录 
    /// </summary> 
    /// <returns></returns> 
    Task<int> GetMaxSortAsync(); 
 
    /// <summary> 
    /// èŽ·å–分页列表出入库记录表 
    /// èŽ·å–分页列表出入库记录 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="sorting"></param> 
@@ -44,7 +44,7 @@
    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> 

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

@@ -11,7 +11,7 @@
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories; 
 
/// <summary> 
/// å‡ºå…¥åº“记录表仓储实现 
/// å‡ºå…¥åº“记录仓储实现 
/// </summary> 
public class EfCoreWmsInOutStockRecordRepository : EfCoreRepository<ICMSPluginDbContext, WmsInOutStockRecord, Guid>, IWmsInOutStockRecordRepository 
{ 
@@ -25,33 +25,33 @@
    } 
 
    /// <summary> 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾å‡ºå…¥åº“记录表 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾å‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="materialNo"></param> 
    /// <param name="name"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public virtual async Task<WmsInOutStockRecord> FindByNameAsync(string materialNo, CancellationToken cancellationToken = default) 
    public virtual async Task<WmsInOutStockRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default) 
    { 
        return await (await GetDbSetAsync()) 
            .IncludeDetails() 
            .Where(x => !x.IsDeleted) 
            .OrderBy(t => t.Sort) 
            .FirstOrDefaultAsync(t => t.MaterialNo == materialNo, GetCancellationToken(cancellationToken)); 
            .FirstOrDefaultAsync(t => t.Id == name, GetCancellationToken(cancellationToken)); 
    } 
 
    /// <summary> 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨å‡ºå…¥åº“记录表 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨å‡ºå…¥åº“记录 
    /// </summary> 
    /// <param name="materialCode"></param> 
    /// <param name="name">校验值</param> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    public async Task<bool> NameExistAsync(string materialCode, Guid? id = null) 
    public async Task<bool> NameExistAsync(string name, Guid? id = null) 
    { 
        return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.MaterialName == materialCode); 
        return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.Id == name); 
    } 
 
    /// <summary> 
    /// èŽ·å–最大排序出入库记录表 
    /// èŽ·å–最大排序出入库记录 
    /// </summary> 
    /// <returns></returns> 
    public async Task<int> GetMaxSortAsync() 
@@ -69,7 +69,7 @@
    } 
 
    /// <summary> 
    /// èŽ·å–分页列表出入库记录表 
    /// èŽ·å–分页列表出入库记录 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="sorting"></param> 
@@ -90,7 +90,7 @@
    } 
 
    /// <summary> 
    /// èŽ·å–总数出入库记录表 
    /// èŽ·å–总数出入库记录 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 

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

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

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

@@ -128,9 +128,9 @@
    { 
      label: '删除', 
      fn: async (c: CurrentType) => { 
        const names = selection.value.map((item: { name: string }) => item.name) 
        const names = selection.value.map((item: { id: string }) => item.id) 
        ConfirmBox( 
          `是否删除${names.length ? names.join(',') : c.row.name}` 
          `是否删除${names.length ? names.join(',') : c.row.id}` 
        ).then(async () => { 
          const ids = selection.value.map((item: { id: string }) => item.id) 
          await wmsInOutStockRecord.deleteWmsInOutStockRecords(ids.length ? ids : [c.row.id]) 
@@ -187,7 +187,7 @@
   */ 
  const onExport = (data={}) => { 
    //const params = tableRef.value?.getParams() 
    exportFile('/api/v1/hIAWms/wmsInOutStockRecord/export', data, 'hIAWms') 
    exportFile('/api/v1/HIAWms/wmsInOutStockRecord/export', data, 'wmsInOutStockRecord') 
  } 
 
  /** 

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

@@ -43,6 +43,27 @@
      ></el-input-number>
    )
  }
  const datePicker = (attrs) => {
    return (
      <el-date-picker
        type="date"
        format="YYYY-MM-DD HH:mm:ss"
        formatValue="YYYY-MM-DD HH:mm:ss"
        {...attrs}
      ></el-date-picker>
    )
  }

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

  const visible = computed({
    get() {
@@ -104,8 +125,14 @@
    {
      label: '操作时间',
      prop: 'operateTime',
      type: 'datetimerange',
      el: 'date-picker',
      el: (props: any, { attrs }: SetupContext) => {
        return h(datePicker, {
          ...props,
          clearable: true,
          ...attrs,
        })
      },
      width: '100%',
      //disabled: disabled,
      placeholder: '请输入操作时间',
    },

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

@@ -16,9 +16,7 @@
import { cloneDeep } from 'lodash'

export const useWmsInOutStockRecordQueryDrawer = (props: any, ctx?: any) => {
  const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>(
    'WmsInOutStockRecordDrawer'
  )
  const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>('WmsInOutStockRecordDrawer') 
  /**
   * ç”¨æ¥å¯¹æ¯”的初始化数据
   */
@@ -41,6 +39,30 @@
        precision="0"
        {...attrs}
      ></el-input-number>
    ) 
  } 
 
    const datePickerRange = (attrs) => { 
    return ( 
      <el-date-picker 
        type="daterange" 
        value-format="YYYY-MM-DD HH:mm:ss" 
        start-placeholder="开始日期" 
        end-placeholder="结束日期" 
        {...attrs} 
      ></el-date-picker> 
    ) 
  } 
 
  const dateTimePickerRange = (attrs) => { 
    return ( 
      <el-date-picker 
        type="datetimerange" 
        value-format="YYYY-MM-DD HH:mm:ss" 
        start-placeholder="开始日期" 
        end-placeholder="结束日期" 
        {...attrs} 
      ></el-date-picker> 
    )
  }

@@ -101,8 +123,15 @@
    {
      label: '操作时间',
      prop: 'operateTime',
      type: 'datetimerange',
      el: 'date-picker',
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(dateTimePickerRange, {  
                       ...props,
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   el: 'input', 
      //disabled: disabled,
      placeholder: '请输入操作时间',
    },
@@ -141,6 +170,29 @@
      //disabled: disabled,
      placeholder: '请输入目标库位',
    },
                { 
                   label: '是否禁用', 
                   prop: 'isDisabled', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入是否禁用', 
                 options: [{label: '是',value: 'true'}, {label: '否',value: 'false'}] 
                }, 
                { 
                   label: '', 
                   prop: 'creationTime', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(dateTimePickerRange, {  
                       ...props,
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入', 
                },  
  ])
  /**
   * æ ¡éªŒæ˜¯å¦æœ‰æ•°æ®å˜åŒ–
@@ -154,39 +206,27 @@
  }
  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,
      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 || '', 
isDisabled: formData.value.isDisabled || '', 
creationTime: formData.value.creationTime || '',  
    }
    return data
    return data; 
  }
  const onClose = (done: () => void) => {
    if (visible.value) {
      visible.value = false
      const data = commonGetFormData()
      const data =commonGetFormData(); 
      ctx.emit('close', data)
    }
  }
@@ -194,7 +234,7 @@
   * ç¡®è®¤æŸ¥è¯¢
   */
  const onConfirmQuery = async () => {
    const data = commonGetFormData()
    const data =commonGetFormData(); 
    ctx.emit('confirmQuery', data)
  }
  /**
@@ -214,22 +254,8 @@
    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')
    ctx.emit('restQuery'); 
  }

  const updateCheckData = () => {
@@ -256,6 +282,7 @@
      EnumName: 'StockTypeEnum',
    })
    updateFormItemOptions('stockType', stockTypeEnumEnum)
 
  }
  commonQueryEnumForFrom()
  /**

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

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

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

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

@@ -1,6 +1,6 @@
import { Base } from '@/libs/Base/Base'
import {
  deleteWmsInOutStockRecord,
  deleteWmsInOutStockRecords, 
  addWmsInOutStockRecord,
  cloneData,
} from './Service/WmsInOutStockRecord'
@@ -18,7 +18,7 @@
   * @returns
   */
  async deleteWmsInOutStockRecords(ids: string[]) {
    return deleteWmsInOutStockRecord(ids)
    return deleteWmsInOutStockRecords(ids) 
  }

  /**

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

@@ -11,7 +11,7 @@
  constructor() {
    super({
      data: [],
      wmsMaterial: {},
      wmsInOutStockRecord: {}, 
    })
  }


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

@@ -11,7 +11,7 @@
  constructor() { 
    super({ 
      data: [], 
      wmsMaterial: {}, 
      wmsInOutStockRecord: {}, 
    }) 
  } 
 

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

@@ -52,8 +52,16 @@
    field: 'toPlace',
    title: '目标库位',
  },
  // {
  //   field: 'deletionTime',
  //   title: '',
  // },
{ 
  field: 'sort', 
  title: '排序', 
}, 
{ 
  field: 'creationTime', 
  title: '', 
}, 
{ 
  field: 'deletionTime', 
  title: '', 
},  
]

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

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

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

@@ -71,9 +71,9 @@
    }) 
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
     'MaterialNo', 'MaterialName', 'Remark' 
     'MaterialNo', 'ContainerNo' 
    ]); 
    const searchFormInputAttrs_Placeholder = ref('请输入物料编码/物料名称/备注'); 
    const searchFormInputAttrs_Placeholder = ref('请输入物料编码/托盘'); 
     
 
    // åŠ¨æ€æžšä¸¾é€‰é¡¹ 

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

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

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

@@ -47,7 +47,6 @@
  {
    field: 'isRead',
    title: 'WCS可读取',
    formatter: ({ cellValue }) => 12222,
  },
  {
    field: 'sonTaskTypeDesc',

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

@@ -214,6 +214,13 @@
                  </div>
                )
              },
              isRead: ({ row }: any) => {
                return (
                  <div>
                    {row.isRead != null ? (row.isRead ? '是' : '否') : '-'}
                  </div>
                )
              },
              name: ({ row }: any) => {
                return row?.name ? (
                  <TdButton

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

@@ -31,21 +31,24 @@
    return props.row || null
  })

  const inputNumber = (attrs) => {
    return (
      <el-input-number
        min="1"
        step="1"
        precision="0"
        {...attrs}
      ></el-input-number>
    )
  }

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

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

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

@@ -1845,9 +1845,9 @@
                    var elment = "input";
                    switch (enumDT)
                    {
                        case DataTypeEnum.dt_datetime:
                            elment = "date-picker";
                            break;
                        //case DataTypeEnum.dt_datetime:
                        //    elment = "date-picker";
                        //    break;
                        case DataTypeEnum.dt_bit:
                        case DataTypeEnum.dt_tinyint:
                            elment = "select";