Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

schangxiang@126.com

2025-05-07 f63d5e9591f8ade8fa7ccb4523d27ff26be81feb

Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

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

@@ -1,5 +1,4 @@
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.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs

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


        /// <summary>

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs

@@ -57,12 +57,12 @@
        /// <summary>
        /// è®¾å¤‡ç±»åž‹
        /// </summary>
        public int Dodevicetype { get; set; }
        public DodevicetypeEnum Dodevicetype { get; set; }

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

        /// <summary>
        /// WCS是否可以读取

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs

@@ -68,13 +68,13 @@
        /// è®¾å¤‡ç±»åž‹
        /// </summary>
        [ExcelColumn(Name = "设备类型", Width = 25)]
        public int Dodevicetype { get; set; }
        public DodevicetypeEnum Dodevicetype { get; set; }

        /// <summary>
        /// è®¾å¤‡ä»»åŠ¡çŠ¶æ€
        /// </summary>
        [ExcelColumn(Name = "设备任务状态", Width = 25)]
        public int TaskDodeviceStatus { get; set; }
        public TaskDodeviceStatus TaskDodeviceStatus { get; set; }

        /// <summary>
        /// WCS是否可以读取

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

@@ -23,16 +23,11 @@
    <ItemGroup>
      <Compile Remove="Util\EnumHelper.cs" />
      <Compile Remove="Util\ExportHelper.cs" />
      <Compile Remove="Util\GetEnumDescriptionUtil.cs" />
    </ItemGroup>

    <ItemGroup>
        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
        <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.20" />
    </ItemGroup>

    <ItemGroup>
      <Folder Include="Util\" />
    </ItemGroup>

</Project>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
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 DodevicetypeEnum
    {
        /// <summary>
        /// å †åž›æœº.
        /// </summary>
        [Description("堆垛机")]
        Srm = 1,

        /// <summary>
        /// è¾“送线.
        /// </summary>
        [Description("输送线")]
        Line,

        /// <summary>
        /// AGV.
        /// </summary>
        [Description("AGV")]
        Agv,
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
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 TaskDodeviceStatus
    {
        /// <summary>
        ///堆垛机未开始
        /// </summary>
        [Description("堆垛机未开始")]
        SrmNoStart = 1,

        /// <summary>
        /// å †åž›æœºæ‰§è¡Œä¸­
        /// </summary>
        [Description("堆垛机执行中")]
        SrmProgress = 2,

        /// <summary>
        /// å †åž›æœºå®Œæˆ
        /// </summary>
        [Description("堆垛机完成")]
        SrmFinish = 3,

        /// <summary>
        ///输送线未开始
        /// </summary>
        [Description("输送线未开始")]
        LineNoStart = 4,

        /// <summary>
        /// è¾“送线执行中
        /// </summary>
        [Description("堆垛机执行中")]
        LineProgress = 5,

        /// <summary>
        /// è¾“送线完成
        /// </summary>
        [Description("堆垛机完成")]
        LineFinish = 6,


        /// <summary>
        ///Agv未开始
        /// </summary>
        [Description("Agv未开始")]
        AgvNoStart = 7,

        /// <summary>
        /// Agv执行中
        /// </summary>
        [Description("堆垛机执行中")]
        AgvProgress = 8,

        /// <summary>
        /// Agv完成
        /// </summary>
        [Description("堆垛机完成")]
        AgvFinish = 9,
    }
}

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

@@ -61,13 +61,13 @@
        /// <summary>
        /// è®¾å¤‡ç±»åž‹
        /// </summary>
        public int Dodevicetype { get; set; }
        public DodevicetypeEnum Dodevicetype { get; set; }


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

        /// <summary>
        /// WCS是否可以读取
@@ -103,6 +103,7 @@
        /// å¯å˜å˜é‡3
        /// </summary>
        public string? MutableParam3 { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>

 HIAWms/web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx

@@ -322,8 +322,8 @@
      updateCheckData()
    } else {
      formData.value = {
        isLock: 2,
        emptyContainer: 2,
        isLock: 0,
        emptyContainer: 0,
        inStockTime: new Date(),
      }
      updateCheckData()

 HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts

@@ -252,8 +252,8 @@
        areaCode: areaList[0], // æ‰€åœ¨åº“区
        aisle: 1, // å··é“
        layerNo: 1, // å±‚
        islock: 2, // æ˜¯å¦é”å®š
        emptyContainer: 2, // æ˜¯å¦ç©ºæ‰˜
        islock: 0, // æ˜¯å¦é”å®š
        emptyContainer: 0, // æ˜¯å¦ç©ºæ‰˜
      }
      updateCheckData()
    }

 HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx

@@ -41,6 +41,25 @@
      ></el-input-number> 
    ) 
  } 
    const datePicker = (attrs) => { 
    return ( 
      <el-date-picker 
        type="datetime" 
        format="YYYY-MM-DD" 
        {...attrs} 
      ></el-date-picker> 
    ) 
  } 
 
   const dateTimePicker = (attrs) => { 
    return ( 
      <el-date-picker 
        type="datetime" 
        format="YYYY-MM-DD HH:mm:ss" 
        {...attrs} 
      ></el-date-picker> 
    ) 
  } 
 
  const visible = computed({ 
    get() { 

 HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx

@@ -102,6 +102,7 @@
          ...attrs,
        })
      },
      width: '100%',
      step: 1,
      precision: 0,
      //disabled: disabled,
@@ -145,6 +146,7 @@
          ...attrs,
        })
      },
      width: '100%',
      step: 1,
      precision: 0,
      //disabled: disabled,
@@ -160,6 +162,7 @@
          ...attrs,
        })
      },
      width: '100%',
      step: 1,
      precision: 0,
      //disabled: disabled,
@@ -175,6 +178,7 @@
          ...attrs,
        })
      },
      width: '100%',
      step: 1,
      precision: 0,
      //disabled: disabled,
@@ -190,6 +194,7 @@
          ...attrs,
        })
      },
      width: '100%',
      step: 1,
      precision: 0,
      //disabled: disabled,
@@ -230,6 +235,7 @@
          ...attrs,
        })
      },
      width: '100%',
      step: 1,
      precision: 0,
      //disabled: disabled,
@@ -256,21 +262,30 @@
      //disabled: disabled,
      placeholder: '请输入可变变量3',
    },

    {
      label: '是否禁用',
      prop: 'isDisabled',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入是否禁用',
      options: [
        { label: '是', value: 'true' },
        { label: '否', value: 'false' },
      ],
    },
    {
      label: '创建时间',
      prop: 'operateTime',
      prop: 'creationTime',
      el: (props: any, { attrs }: SetupContext) => {
        return h(datePickerRange, {
        return h(dateTimePickerRange, {
          ...props,
          clearable: true,
          ...attrs,
        })
      },
      step: 1,
      precision: 0,
      width: '100%',
      //disabled: disabled,
      placeholder: '请输入下个任务是否生成成功',
      placeholder: '请输入',
    },
  ])
  /**
@@ -284,27 +299,27 @@
    return check
  }
  const commonGetFormData = () => {
    console.log(formData.value.operateTime)
    const data = {
      TaskNo: formData.value.TaskNo,
      TaskType: formData.value.TaskType,
      TaskLevel: formData.value.TaskLevel,
      TaskStatus: formData.value.TaskStatus,
      ContainerNo: formData.value.ContainerNo,
      SourcePlace: formData.value.SourcePlace,
      ToPlace: formData.value.ToPlace,
      Aisle: formData.value.Aisle,
      DodeviceId: formData.value.DodeviceId,
      Dodevicetype: formData.value.Dodevicetype,
      TaskDodeviceStatus: formData.value.TaskDodeviceStatus,
      IsRead: formData.value.IsRead,
      SonTaskType: formData.value.SonTaskType,
      SourceOrderNo: formData.value.SourceOrderNo,
      IsNextTask: formData.value.IsNextTask,
      MutableParam1: formData.value.MutableParam1,
      MutableParam2: formData.value.MutableParam2,
      MutableParam3: formData.value.MutableParam3,
      creationTime: formData.value.operateTime,
      taskNo: formData.value.taskNo || '',
      taskType: formData.value.taskType || '',
      taskLevel: formData.value.taskLevel || '',
      taskStatus: formData.value.taskStatus || '',
      containerNo: formData.value.containerNo || '',
      sourcePlace: formData.value.sourcePlace || '',
      toPlace: formData.value.toPlace || '',
      aisle: formData.value.aisle || '',
      dodeviceId: formData.value.dodeviceId || '',
      dodevicetype: formData.value.dodevicetype || '',
      taskDodeviceStatus: formData.value.taskDodeviceStatus || '',
      isRead: formData.value.isRead || '',
      sonTaskType: formData.value.sonTaskType || '',
      sourceOrderNo: formData.value.sourceOrderNo || '',
      isNextTask: formData.value.isNextTask || '',
      mutableParam1: formData.value.mutableParam1 || '',
      mutableParam2: formData.value.mutableParam2 || '',
      mutableParam3: formData.value.mutableParam3 || '',
      isDisabled: formData.value.isDisabled || '',
      creationTime: formData.value.creationTime || '',
    }
    return data
  }
@@ -345,7 +360,6 @@
    formData.value.MutableParam1 = ''
    formData.value.MutableParam2 = ''
    formData.value.MutableParam3 = ''
    formData.value.operateTime = []
    //向父组件发送自定义事件
    ctx.emit('restQuery')
  }

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

@@ -13,10 +13,6 @@
  title: '任务类型', 
}, 
{ 
  field: 'taskLevel', 
  title: '任务等级', 
}, 
{ 
  field: 'taskStatusDesc', 
  title: '任务状态', 
}, 
@@ -36,21 +32,22 @@
  field: 'aisle', 
  title: '巷道', 
}, 
{ 
  field: 'dodeviceId', 
  title: '堆垛机ID', 
}, 
  // {
  //   field: 'dodeviceId',
  //   title: '堆垛机ID',
  // },
{ 
  field: 'dodevicetype', 
  title: '设备类型', 
}, 
{ 
  field: 'taskDodeviceStatus', 
  title: '设备任务状态', 
    title: '设备状态',
}, 
{ 
  field: 'isRead', 
  title: 'WCS是否可以读取', 
    title: 'WCS可读取',
    formatter: ({ cellValue }) => 12222,
}, 
{ 
  field: 'sonTaskTypeDesc', 
@@ -58,34 +55,34 @@
}, 
{ 
  field: 'sourceOrderNo', 
  title: '来源单据号', 
    title: '来源单号',
}, 
  // {
  //   field: 'isNextTask',
  //   title: '下个任务是否生成成功',
  // },
{ 
  field: 'isNextTask', 
  title: '下个任务是否生成成功', 
    field: 'taskLevel',
    title: '任务等级',
}, 
{ 
  field: 'mutableParam1', 
  title: '可变变量1', 
}, 
{ 
  field: 'mutableParam2', 
  title: '可变变量2', 
}, 
{ 
  field: 'mutableParam3', 
  title: '可变变量3', 
}, 
{ 
  field: 'sort', 
  title: '排序', 
}, 
  // {
  //   field: 'mutableParam1',
  //   title: '可变变量1',
  // },
  // {
  //   field: 'mutableParam2',
  //   title: '可变变量2',
  // },
  // {
  //   field: 'mutableParam3',
  //   title: '可变变量3',
  // },
  // {
  //   field: 'sort',
  //   title: '排序',
  // },
{ 
  field: 'creationTime', 
  title: '', 
}, 
{ 
  field: 'deletionTime', 
  title: '', 
    title: '创建时间',
},  
] 

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

@@ -10,9 +10,8 @@
import { columns } from './Config' 
import TdButton from '@/components/TdButton/TdButton' 
import { vPermission } from '@/libs/Permission/Permission' 
import { 
  getWmsEnumData 
} from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer' 
import { getWmsEnumData } from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer'
import dayjs from 'dayjs'
import { 
  ElInput, 
  ElSelect, 
@@ -63,18 +62,15 @@
    } = useWmsTask(props, ctx) 
 
    //定义高级查询引用 
   const wmsTaskQueryDrawerRef=ref(null); 
    const wmsTaskQueryDrawerRef = ref(null)
    // æ–°å¢žçš„查询条件 
    const queryForm = ref({ 
      searchVal: '', 
      str_searchFormInputAttrs:[] 
      str_searchFormInputAttrs: [],
    }) 
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
     'TaskNo', 'ContainerNo' 
    ]); 
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码'); 
     
    const _searchFormInputAttrs = ref(['TaskNo', 'ContainerNo'])
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码')
 
    // åŠ¨æ€æžšä¸¾é€‰é¡¹ 
    const enumOptions = reactive({ 
@@ -107,7 +103,6 @@
  label: item.description, 
  value: item.value, 
})) 
 
      } catch (error) { 
        console.error('获取枚举数据失败:', error) 
      } 
@@ -119,40 +114,45 @@
    }) 
 
    // å®šä¹‰å“åº”式查询数据 
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] }); 
    const _curHighQueryData = ref({
      searchVal: '',
      str_searchFormInputAttrs: [],
    })
    // æ–°ç‰ˆçš„查询方法（主页面中的按钮【查询】） 
    const handleQueryForMain = async () => { 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
      _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); 
      let filteredData = commonGetHighQueryForm(extraParams)
      commonSaveCurHighQueryData(filteredData)
      tableRef.value.getList(filteredData) 
    } 
    // æ–°ç‰ˆçš„查询重置 
    const resetQuery = () => { 
      queryForm.value.searchVal = '' 
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value; 
      queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
    } 
     //新版的导出方法 
     const handleExport=()=>{ 
      onExport(_curHighQueryData.value); 
      onExport(_curHighQueryData.value)
    } 
    // æ–°ç‰ˆçš„查询弹出框关闭方法 
    const closeQuery = (extraParams={}) => { 
      let filteredData = commonGetHighQueryForm(extraParams); 
      console.log("closeQuery方法"); 
      console.log(filteredData); 
      commonSaveCurHighQueryData(filteredData); 
      let filteredData = commonGetHighQueryForm(extraParams)
      console.log('closeQuery方法')
      console.log(filteredData)
      commonSaveCurHighQueryData(filteredData)
    } 
    //保存查询值 
    const commonSaveCurHighQueryData=(filteredData={})=>{ 
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }; 
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
      _curHighQueryData.value.searchVal = queryForm.value.searchVal 
      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
    } 
     //获取高级查询弹出框的查询值 
     const commonGetHighQueryForm=(extraParams={})=>{ 
@@ -165,10 +165,9 @@
      ) 
      //组合模糊查询 
      filteredData.searchVal = queryForm.value.searchVal 
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
      return filteredData; 
      filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
      return filteredData
    } 
    
 
    /** 
     * @returns è¡¨æ ¼ 
@@ -206,6 +205,15 @@
            isHidePagination={isHidePagination} 
            pageSize={20} 
            v-slots={{ 
              creationTime: ({ row }: any) => {
                return (
                  <div>
                    {row.creationTime != null
                      ? dayjs(row.creationTime).format('YYYY-MM-DD HH:mm:ss')
                      : '-'}
                  </div>
                )
              },
              name: ({ row }: any) => { 
                return row?.name ? ( 
                  <TdButton 
@@ -294,7 +302,11 @@
                  class={styles.formItem} 
                /> 
              </ElFormItem> 
              <IconButton type="primary" icon="search" onClick={handleQueryForMain}> 
              <IconButton
                type="primary"
                icon="search"
                onClick={handleQueryForMain}
              >
                æŸ¥è¯¢ 
              </IconButton> 
              {/* <IconButton style="" icon="refresh" onClick={resetQuery}> 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs

@@ -22,8 +22,8 @@

            //替换新增form列表属性
            string attrString = "";
            List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForUpdateMode(param.ColumnNameList);
            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query(param.ColumnNameList, param);
            List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForQueryMode(param.ColumnNameList);
            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query(newColumnNameList, param);
            str = str.Replace("$PageAddFormAttributes_Query$", attrString);

            attrString = "";

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

@@ -42,6 +42,29 @@
    )
  }

    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>
    )
  }

  const visible = computed({
    get() {

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

@@ -187,7 +187,7 @@
   */
  const onExport = (data={}) => {
    //const params = tableRef.value?.getParams()
    exportFile('/api/v1/$NameSpacePath$/$PageMenuInstanceName$/export', data, '$NameSpacePath$')
    exportFile('/api/v1/$NameSpacePath$/$PageMenuInstanceName$/export', data, '$PageMenuInstanceName$')
  }

  /**

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

@@ -391,6 +391,35 @@
            return newList;
        }

        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_ModifyTime.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)
        /// </summary>

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

@@ -1975,8 +1975,8 @@
      placeholder: '请输入物料编码',
    },
                 */
                List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
                foreach (var columnModel in newList)
                //List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
                foreach (var columnModel in columnModelList)
                {
                    //首字母小写
                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
@@ -1984,9 +1984,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";
@@ -2002,7 +2002,15 @@
                    switch (enumDT)
                    {
                        case DataTypeEnum.dt_datetime:
                            sb.Append("                   type: 'datetimerange', \n");
                            sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
                            sb.Append("                     return h(dateTimePickerRange, {  \n");
                            sb.Append("                       ...props,\n");
                            sb.Append("                       clearable: true, \n");
                            sb.Append("                       ...attrs,  \n");
                            sb.Append("                     })  \n");
                            sb.Append("                   },\n");

                            sb.Append("                   width: '100%',\n");
                            break;
                        default:
                            break;
@@ -2207,17 +2215,15 @@
                /*
                  materialCode: formData.value.materialCode,
                 */
                List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
                List<ColumnModel> newList = ListHelper.RemoveAttrForQueryMode(columnModelList);
                foreach (var columnModel in newList)
                {
<<<<<<< HEAD

                    //首字母小写
                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                    sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, \n");
=======
                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                    sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName},  || ''\n");
>>>>>>> a1cdc5e71aa827651a6c3e313fd7acc95b09c097
                    sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName} || '', \n");


                }
                //去掉最后一个,
                var res = sb.ToString();