导出模板修改

zs

2025-05-07 ce86642feb81352ce43701fceda3ec59ce662905

导出模板修改

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs

@@ -1,4 +1,5 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CmsQueryExtensions;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;


 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,86 @@
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder
{
    /// <summary>
    /// å‡ºå…¥åº“单据
    /// </summary>
    public class WmsInOutOrder
    {
        /// <summary>
        /// å•æ®ç¼–号
        /// </summary>
        public string OrderNo { get; set; }

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

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

        /// <summary>
        /// å…³è”计划编号
        /// </summary>
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "关联计划编号", Length = 32)]
        public string? PlanNo { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        [SugarColumn(ColumnName = "StockType", ColumnDescription = "操作类型")]
        //public OperationType StockType { get; set; }
        public StockType StockType { get; set; }

        /// <summary>
        /// å®¹å™¨ç¼–号
        /// </summary>
        [SugarColumn(ColumnName = "ContainerNo", ColumnDescription = "容器编号", Length = 32)]
        public string? ContainerNo { get; set; }

        /// <summary>
        /// æœºåž‹
        /// </summary>
        [SugarColumn(ColumnName = "MaterialModel", ColumnDescription = "机型", Length = 32)]
        public string? MaterialModel { get; set; }

        /// <summary>
        /// ä¸‹å‘数量
        /// </summary>
        [SugarColumn(ColumnName = "DistributeNumber", ColumnDescription = "下发数量")]
        public int? DistributeNumber { get; set; }

        /// <summary>
        /// å®Œæˆæ•°é‡
        /// </summary>
        [SugarColumn(ColumnName = "CompleteNumber", ColumnDescription = "完成数量")]
        public int? CompleteNumber { get; set; }

        /// <summary>
        /// å¼‚常数量
        /// </summary>
        [SugarColumn(ColumnName = "ExceptNumber", ColumnDescription = "异常数量")]
        public int? ExceptNumber { get; set; }
        /// <summary>
        /// æ“ä½œæ—¶é—´
        /// </summary>
        [SugarColumn(ColumnName = "OperateTime", ColumnDescription = "操作时间")]
        public DateTime? OperateTime { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [SugarColumn(ColumnName = "Remark", ColumnDescription = "备注", Length = 500)]
        public string? Remark { get; set; }

    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
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.WmsMaterialContainer
{
    /// <summary>
    /// ç‰©æ–™å®¹å™¨å…³ç³»
    /// </summary>
    public class WmsMaterialContainer : FullAuditedAggregateRoot<Guid>
    {
        /// <summary>
        /// æ‰˜ç›˜å·
        /// </summary>
        public string ContainerNo { get; set; }

        /// <summary>
        /// ç‰©æ–™Id
        /// </summary>
        public string MaterialId { 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/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.WmsContainerPlaces;
using CMS.Plugin.HIAWms.Domain.WmsMaterialContainer;
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
{
    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<WmsMaterialContainer> IncludeDetails(this IQueryable<WmsMaterialContainer> queryable, bool include = true)
        {
            if (!include)
            {
                return queryable;
            }

            return queryable;
        }

        /// <summary>
        /// Configures the WMS container place relationship.
        /// </summary>
        /// <param name="builder">The builder.</param>
        public static void ConfigureWmsMaterialContainer(this ModelBuilder builder)
        {
            Check.NotNull(builder, nameof(builder));

            builder.Entity<WmsMaterialContainer>(b =>
            {
                b.ToTable((CMSPluginDbProperties.DbTablePrefix + "WmsMaterialContainer").ToLower(), CMSPluginDbProperties.DbSchema)
                    .HasComment("物料容器关系表");

                b.ConfigureByConvention();
                // ä¸»é”®é…ç½®
                b.HasKey(x => x.Id);
                // Properties
                b.Property(x => x.MaterialId)
                    .HasMaxLength(64)
                    .IsRequired()
                    .HasComment("物料ID");

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

                // Composite primary key
                b.HasKey(x => new { x.MaterialId, x.ContainerNo });

                // Indexes
                b.HasIndex(x => x.MaterialId);
                b.HasIndex(x => x.ContainerNo);

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

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

@@ -42,6 +42,7 @@
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        builder.ConfigureWmsTask();
        builder.ConfigureWmsMaterialContainer();

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


 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Generate.cs

@@ -26,6 +26,11 @@
            str = str.Replace("$EntityNameClass_enumOptions$", attrString);


             attrString = "";
            attrString += StructStrHelper.GetVueFormOptionsStrForPageAdd_QueryTableListForBool(param.ColumnNameList, param);
            str = str.Replace("$QueryTableListForBool$", attrString);


            attrString = "";
            attrString += StructStrHelper.GetVueFormOptionsStr_EntityNameClass_fetchEnumData(param.ColumnNameList, param);
            str = str.Replace("$EntityNameClass_fetchEnumData$", attrString);

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

@@ -183,6 +183,7 @@
            isHidePagination={isHidePagination}
            pageSize={20}
            v-slots={{
              $QueryTableListForBool$
              name: ({ row }: any) => {
                return row?.name ? (
                  <TdButton

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

@@ -1907,7 +1907,7 @@
                                isWriteInt = false;
                            }
                        }
                        if(isWriteInt)
                        if (isWriteInt)
                        {
                            sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
                            sb.Append("                     return h(inputNumber, {  \n");
@@ -2360,6 +2360,78 @@
            }
        }

        public static string GetVueFormOptionsStrForPageAdd_QueryTableListForBool(List<ColumnModel> columnModelList, GenerateCodeParam param)
        {
            StringBuilder sb = new StringBuilder();
            try
            {
                /*
                  
                isRead: ({ row }: any) => {
                return (
                  <div>
                    {row.isRead != null ? (row.isRead ? '是' : '否') : '-'}
                  </div>
                )
              },

                creationTime: ({ row }: any) => {
                return (
                  <div>
                    {row.creationTime != null
                      ? dayjs(row.creationTime).format('YYYY-MM-DD HH:mm:ss')
                      : '-'}
                  </div>
                )
              },

                 */

                foreach (var columnModel in columnModelList)
                {
                    //属性小写
                    var instanceColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                    //获取数据类型
                    DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
                    switch (enumDT)
                    {
                        case DataTypeEnum.dt_datetime:
                            sb.Append(instanceColumnName + ": ({ row }: any) => { \n");
                            sb.Append(" return ( \n");
                            sb.Append("   <div>  \n");
                            sb.Append("     {row." + instanceColumnName + " != null \n");
                            sb.Append("     ? dayjs(row." + instanceColumnName + ").format('YYYY-MM-DD HH:mm:ss') \n");
                            sb.Append("      : '-'} \n");
                            sb.Append("   </div>  \n");
                            sb.Append("  ) \n");
                            sb.Append("},\n");
                            break;

                        case DataTypeEnum.dt_bit:
                        case DataTypeEnum.dt_tinyint:
                            sb.Append(instanceColumnName + ": ({ row }: any) => { \n");
                            sb.Append(" return ( \n");
                            sb.Append("   <div>  \n");
                            sb.Append("     {row." + instanceColumnName + " != null ? (row." + instanceColumnName + " ? '是' : '否') : '-'} \n");
                            sb.Append("   </div>  \n");
                            sb.Append("  ) \n");
                            sb.Append("},\n");
                            break;
                    }

                }

                //去掉最后一个,
                var res = sb.ToString();
                res = res.Substring(0, res.Length - 1);
                return res;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        /// <summary>
        /// èŽ·å–VUE å¯¼å‡ºæ•°ç»„字符串-汉字+属性
        /// </summary>