优化查询列表

schangxiang@126.com

2025-05-09 f892002a22d5cc1f09d764c20b812d81a519135a

优化查询列表

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Model/SystemCommonVar.cs

@@ -21,7 +21,7 @@
        public const string c_lastModifyTime = "LastModificationTime";


       


        public const string c_ExtraProperties = "ExtraProperties";

@@ -38,5 +38,7 @@

        public const string c_DeletionTime = "DeletionTime";

        //扩展字段
        public static List<string> c_Extend = new List<string>() { "OperationRemark".ToUpper(), "DeleteRemark".ToUpper(), "ExtraField1".ToUpper(), "ExtraField2".ToUpper(), "ExtraField3".ToUpper() };
    }
}

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

@@ -23,18 +23,73 @@
            for (int i = 0; i < columnNameList.Count; i++)
            {
                columnModel = columnNameList[i];
                if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
                if (
                    columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
                    || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
                    )
                {
                    continue;
                }
                newList.Add(columnModel);
            }
            return newList;
        }

        #endregion

        #region ã€é¡µé¢ã€‘列表界面

        /// <summary>
        /// é¡µé¢è¡¨æ ¼å±•ç¤ºçš„ å­—段列表
        /// </summary>
        /// <param name="columnNameList"></param>
        /// <returns></returns>
        public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
        {
            List<ColumnModel> newList = new List<ColumnModel>();
            ColumnModel columnModel = null;
            for (int i = 0; i < columnNameList.Count; i++)
            {
                columnModel = columnNameList[i];
                if (
                    columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
                    || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())

                    )
                {
@@ -46,6 +101,53 @@
        }

        #endregion

        #region ã€é¡µé¢ã€‘高级查询显示的列

        /// <summary>
        /// ã€é¡µé¢ã€‘高级查询显示的列
        /// </summary>
        /// <param name="columnNameList"></param>
        /// <returns></returns>
        public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
        {
            List<ColumnModel> newList = new List<ColumnModel>();
            ColumnModel columnModel = null;
            for (int i = 0; i < columnNameList.Count; i++)
            {
                columnModel = columnNameList[i];
                if (
                     columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()

                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
                    || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
                    )
                {
                    continue;
                }
                newList.Add(columnModel);
            }
            return newList;
        }

        #endregion

        /// <summary>
        /// èŽ·å–最新的列List集合(去掉 creator和createTime)
        /// </summary>
@@ -213,41 +315,7 @@
        }


        /// <summary>
        /// é¡µé¢è¡¨æ ¼å±•ç¤ºçš„ å­—段列表
        /// </summary>
        /// <param name="columnNameList"></param>
        /// <returns></returns>
        public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
        {
            List<ColumnModel> newList = new List<ColumnModel>();
            ColumnModel columnModel = null;
            for (int i = 0; i < columnNameList.Count; i++)
            {
                columnModel = columnNameList[i];
                if (
                    columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
                    // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_IsDisabled.ToUpper()
                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()

                    )
                {
                    continue;
                }
                newList.Add(columnModel);
            }
            return newList;
        }

        /// <summary>
        /// èŽ·å–最新的列List集合(去掉 Id，CreateId，ModifyId)
@@ -387,34 +455,7 @@
        }



        public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
        {
            List<ColumnModel> newList = new List<ColumnModel>();
            ColumnModel columnModel = null;
            for (int i = 0; i < columnNameList.Count; i++)
            {
                columnModel = columnNameList[i];
                if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()

                    )
                {
                    continue;
                }
                newList.Add(columnModel);
            }
            return newList;
        }
       

        /// <summary>
        /// èŽ·å–最新的列List集合(去掉 ID)

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

@@ -2262,7 +2262,12 @@
        }



        /// <summary>
        /// é¡µé¢è¡¨æ ¼åˆ—显示
        /// </summary>
        /// <param name="columnModelList"></param>
        /// <param name="param"></param>
        /// <returns></returns>
        public static string GetVueFormOptionsStr_EntityNameClass_Config_Attrs(List<ColumnModel> columnModelList, GenerateCodeParam param)
        {
            StringBuilder sb = new StringBuilder();

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs

@@ -140,14 +140,9 @@
        public string? LastModifierId { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
        /// åˆ é™¤æ—¶é—´
        /// </summary>
        public string? CreatorName { get; set; }

        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        public string? LastModifierName { get; set; }
        public DateTime? DeletionTime { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs

@@ -155,16 +155,10 @@
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
        /// åˆ é™¤æ—¶é—´
        /// </summary>
        [ExcelColumn(Name = "创建人", Width = 25)]
        public string CreatorName { get; set; }

        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        [ExcelColumn(Name = "修改人", Width = 25)]
        public string LastModifierName { get; set; }
        [ExcelColumn(Name = "删除时间", Width = 25)]
        public DateTime DeletionTime { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs

@@ -166,13 +166,6 @@
        updateObj.RedundantField3 = input.RedundantField3;
        updateObj.Remark = input.Remark;
        updateObj.IsDisabled = input.IsDisabled;
        updateObj.CreatorName = input.CreatorName;
        updateObj.LastModifierName = input.LastModifierName;
        updateObj.OperationRemark = input.OperationRemark;
        updateObj.DeleteRemark = input.DeleteRemark;
        updateObj.ExtraField1 = input.ExtraField1;
        updateObj.ExtraField2 = input.ExtraField2;
        updateObj.ExtraField3 = input.ExtraField3;
 
 
        await wmsMaterialRepository.UpdateAsync(updateObj); 
@@ -351,13 +344,6 @@
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
OperationRemark = impItem.OperationRemark,
DeleteRemark = impItem.DeleteRemark,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
 
                    }; 
 
@@ -390,13 +376,6 @@
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
OperationRemark = impItem.OperationRemark,
DeleteRemark = impItem.DeleteRemark,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
 
                    }; 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterialµ¼³öÄ£°å.xlsx

Binary files differ

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx

@@ -300,18 +300,18 @@
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '创建人', 
                   prop: 'creatorName', 
                   el: 'input', 
                   label: '删除时间', 
                   prop: 'deletionTime', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(datePicker, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   //disabled: disabled, 
                   placeholder: '请输入创建人', 
                }, 
                { 
                   label: '修改人', 
                   prop: 'lastModifierName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入修改人', 
                   placeholder: '请输入删除时间', 
                }, 
                { 
                   label: '操作备注', 
@@ -405,8 +405,7 @@
redundantField2: formData.value.redundantField2, 
redundantField3: formData.value.redundantField3, 
remark: formData.value.remark, 
creatorName: formData.value.creatorName, 
lastModifierName: formData.value.lastModifierName, 
deletionTime: formData.value.deletionTime, 
operationRemark: formData.value.operationRemark, 
deleteRemark: formData.value.deleteRemark, 
extraField1: formData.value.extraField1, 
@@ -488,8 +487,7 @@
redundantField2: res.redundantField2, 
redundantField3: res.redundantField3, 
remark: res.remark, 
creatorName: res.creatorName, 
lastModifierName: res.lastModifierName, 
deletionTime: res.deletionTime, 
operationRemark: res.operationRemark, 
deleteRemark: res.deleteRemark, 
extraField1: res.extraField1, 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx

@@ -300,6 +300,13 @@
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '扩展属性', 
                   prop: 'extraProperties', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展属性', 
                }, 
                { 
                   label: '创建时间', 
                   prop: 'creationTime', 
                   el: (props: any, { attrs }: SetupContext) => { 
@@ -314,6 +321,20 @@
                   placeholder: '请输入创建时间', 
                }, 
                { 
                   label: '修改时间', 
                   prop: 'lastModificationTime', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(dateTimePickerRange, {  
                       ...props,
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   //disabled: disabled, 
                   placeholder: '请输入修改时间', 
                }, 
                { 
                   label: '创建人', 
                   prop: 'creatorName', 
                   el: 'input', 
@@ -326,41 +347,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入修改人', 
                }, 
                { 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入删除备注', 
                }, 
                { 
                   label: '扩展字段1', 
                   prop: 'extraField1', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段1', 
                }, 
                { 
                   label: '扩展字段2', 
                   prop: 'extraField2', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段2', 
                }, 
                { 
                   label: '扩展字段3', 
                   prop: 'extraField3', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段3', 
                },  
  ]) 
  /** 
@@ -398,14 +384,11 @@
redundantField3: formData.value.redundantField3 || '', 
remark: formData.value.remark || '', 
isDisabled: formData.value.isDisabled || '', 
extraProperties: formData.value.extraProperties || '', 
creationTime: formData.value.creationTime || '', 
lastModificationTime: formData.value.lastModificationTime || '', 
creatorName: formData.value.creatorName || '', 
lastModifierName: formData.value.lastModifierName || '', 
operationRemark: formData.value.operationRemark || '', 
deleteRemark: formData.value.deleteRemark || '', 
extraField1: formData.value.extraField1 || '', 
extraField2: formData.value.extraField2 || '', 
extraField3: formData.value.extraField3 || '',  
lastModifierName: formData.value.lastModifierName || '',  
    } 
    return data; 
  } 
@@ -450,8 +433,7 @@
formData.value.RedundantField2 = '' 
formData.value.RedundantField3 = '' 
formData.value.Remark = '' 
formData.value.CreatorName = '' 
formData.value.LastModifierName = '' 
formData.value.DeletionTime = '' 
formData.value.OperationRemark = '' 
formData.value.DeleteRemark = '' 
formData.value.ExtraField1 = '' 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts

@@ -110,13 +110,18 @@
  width:160, 
}, 
{ 
  field: 'sort', 
  title: '排序', 
  field: 'remark', 
  title: '备注', 
  width:160, 
}, 
{ 
  field: 'remark', 
  title: '备注', 
  field: 'isDisabled', 
  title: '是否禁用', 
  width:80, 
}, 
{ 
  field: 'extraProperties', 
  title: '扩展属性', 
  width:160, 
}, 
{ 
@@ -125,8 +130,8 @@
  width:180, 
}, 
{ 
  field: 'deletionTime', 
  title: '删除时间', 
  field: 'lastModificationTime', 
  title: '修改时间', 
  width:180, 
}, 
{ 
@@ -137,31 +142,6 @@
{ 
  field: 'lastModifierName', 
  title: '修改人', 
  width:160, 
}, 
{ 
  field: 'operationRemark', 
  title: '操作备注', 
  width:160, 
}, 
{ 
  field: 'deleteRemark', 
  title: '删除备注', 
  width:160, 
}, 
{ 
  field: 'extraField1', 
  title: '扩展字段1', 
  width:160, 
}, 
{ 
  field: 'extraField2', 
  title: '扩展字段2', 
  width:160, 
}, 
{ 
  field: 'extraField3', 
  title: '扩展字段3', 
  width:160, 
},  
]