schangxiang@126.com
2025-05-21 a3a2b238a2626ef8744e7a135f9ca2e2fbb5184c
优化
已重命名2个文件
已修改28个文件
1967 ■■■■ 文件已修改
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx 175 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanQueryDrawer.tsx 366 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx 91 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx 169 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/Config.ts 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/vite.lib.config.ts 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs 78 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskCreateOrUpdateDtoBase.cs 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskDto.cs 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs 78 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkTask/WorkTask.cs 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkTask.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.Designer.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.cs 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkTaskController.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Resources/Templates/WorkTask导出模板.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx
@@ -18,7 +18,8 @@
import {   
  BOOLEAN_OPTIONS_AddEdit  
} from '@/utils/commonOptionConstants';  
// å¼•入公共表单工具文件
import { extractFormDataForOnConfirm,extractAndAssignFormData } from '@/utils/myformUtils';
export const useWorkPlanDrawer = (props: any, ctx?: any) => { 
  const workPlanDrawer = injectModel<WorkPlanDrawer>('workPlanDrawer') 
  /** 
@@ -89,6 +90,48 @@
              rules: [{required: true, message: '任务编码不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '管段编码',
                   prop: 'pipeSpecCode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段编码',
                },
                {
                   label: '管段名称',
                   prop: 'pipeSectionName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段名称',
                },
                {
                   label: '管段型号',
                   prop: 'pipeSpecMode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段型号',
                },
                {
                   label: '工序名称',
                   prop: 'processName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工序名称',
                },
                {
                   label: '船号',
                   prop: 'shipNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入船号',
                },
                {
                   label: '项目号',
                   prop: 'projectNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入项目号',
                },
                {
                   label: '计划状态', 
                   prop: 'workPlanStatus', 
                   el: 'select', 
@@ -107,6 +150,13 @@
                   //disabled: disabled, 
                   placeholder: '请输入叫料状态', 
              rules: [{required: true, message: '叫料状态不能为空', trigger: 'blur' }], 
                },
                {
                   label: '工艺流向编号',
                   prop: 'processRouteNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工艺流向编号',
                }, 
                { 
                   label: '原料标识', 
@@ -315,27 +365,6 @@
                   placeholder: '请输入产线编码', 
                }, 
                { 
                   label: '船号',
                   prop: 'shipNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入船号',
                },
                {
                   label: '项目号',
                   prop: 'projectNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入项目号',
                },
                {
                   label: '工序名称',
                   prop: 'processName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工序名称',
                },
                {
                   label: '管件编码', 
                   prop: 'pipeFittingCode', 
                   el: 'input', 
@@ -348,20 +377,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入顺序号', 
                },
                {
                   label: '管段编码',
                   prop: 'pipeSpecCode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段编码',
                },
                {
                   label: '管段名称',
                   prop: 'pipeSectionName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段名称',
                }, 
                { 
                   label: '外径(mm)', 
@@ -403,13 +418,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入材质', 
                },
                {
                   label: '工艺流向编号',
                   prop: 'processRouteNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工艺流向编号',
                }, 
                { 
                   label: '计划开始时间', 
@@ -494,45 +502,7 @@
   */ 
  const onConfirm = async () => { 
    await formRef.value?.validate() 
    const data = {
      taskCode: formData.value.taskCode,
workPlanStatus: formData.value.workPlanStatus,
callMaterialStatus: formData.value.callMaterialStatus,
dataIdentifier: formData.value.dataIdentifier,
materialMode: formData.value.materialMode,
length: formData.value.length,
markingContent: formData.value.markingContent,
markingPosition: formData.value.markingPosition,
cuttingPosition: formData.value.cuttingPosition,
quantity: formData.value.quantity,
flangeThickness: formData.value.flangeThickness,
flangeInnerDiameter: formData.value.flangeInnerDiameter,
weldingHeatInput: formData.value.weldingHeatInput,
pipeAllowableStress: formData.value.pipeAllowableStress,
pipeDiameter: formData.value.pipeDiameter,
pipeWallThickness: formData.value.pipeWallThickness,
factoryCode: formData.value.factoryCode,
productCode: formData.value.productCode,
workstationCode: formData.value.workstationCode,
equipmentCode: formData.value.equipmentCode,
prodLineCode: formData.value.prodLineCode,
shipNumber: formData.value.shipNumber,
projectNumber: formData.value.projectNumber,
processName: formData.value.processName,
pipeFittingCode: formData.value.pipeFittingCode,
preSerialNumber: formData.value.preSerialNumber,
pipeSpecCode: formData.value.pipeSpecCode,
pipeSectionName: formData.value.pipeSectionName,
outerDiameter: formData.value.outerDiameter,
thickness: formData.value.thickness,
material: formData.value.material,
processRouteNumber: formData.value.processRouteNumber,
plannedStartTime: formData.value.plannedStartTime,
plannedEndTime: formData.value.plannedEndTime,
teamInfo: formData.value.teamInfo,
timestamp: formData.value.timestamp,
remark: formData.value.remark,
    }
    const data=extractFormDataForOnConfirm(formData);
    if (!current.value) { 
      await workPlanDrawer.addWorkPlan(data) 
    } else { 
@@ -581,46 +551,7 @@
    if (current.value) { 
      const res = await workPlanDrawer.getWorkPlanDetail(current.value) 
 
      formData.value = {
        taskCode: res.taskCode,
workPlanStatus: res.workPlanStatus,
callMaterialStatus: res.callMaterialStatus,
dataIdentifier: res.dataIdentifier,
materialMode: res.materialMode,
length: res.length,
markingContent: res.markingContent,
markingPosition: res.markingPosition,
cuttingPosition: res.cuttingPosition,
quantity: res.quantity,
flangeThickness: res.flangeThickness,
flangeInnerDiameter: res.flangeInnerDiameter,
weldingHeatInput: res.weldingHeatInput,
pipeAllowableStress: res.pipeAllowableStress,
pipeDiameter: res.pipeDiameter,
pipeWallThickness: res.pipeWallThickness,
factoryCode: res.factoryCode,
productCode: res.productCode,
workstationCode: res.workstationCode,
equipmentCode: res.equipmentCode,
prodLineCode: res.prodLineCode,
shipNumber: res.shipNumber,
projectNumber: res.projectNumber,
processName: res.processName,
pipeFittingCode: res.pipeFittingCode,
preSerialNumber: res.preSerialNumber,
pipeSpecCode: res.pipeSpecCode,
pipeSectionName: res.pipeSectionName,
outerDiameter: res.outerDiameter,
thickness: res.thickness,
material: res.material,
processRouteNumber: res.processRouteNumber,
plannedStartTime: res.plannedStartTime,
plannedEndTime: res.plannedEndTime,
teamInfo: res.teamInfo,
timestamp: res.timestamp,
remark: res.remark,
        id: res.id,
      }
      extractAndAssignFormData(res,formData);
      disabled.value = true 
      updateCheckData() 
    } else { 
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanQueryDrawer.tsx
@@ -20,6 +20,8 @@
  FILTER_MODE_OPTIONS_NUM, 
  FILTER_MODE_OPTIONS_BOOL 
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'; 
// å¼•入公共表单工具文件
import { collectFormDataForHighQuery,onResetForHighSelect,onResetForHighQuery } from '@/utils/myformUtils';
import {  
  BOOLEAN_OPTIONS 
} from '@/utils/commonOptionConstants'; 
@@ -101,6 +103,84 @@
                   } 
                }, 
                { 
                   label: '管段编码',
                   prop: 'pipeSpecCode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段编码',
                   highSelectAttrs:{
                     prop: 'pipeSpecCode_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管段名称',
                   prop: 'pipeSectionName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段名称',
                   highSelectAttrs:{
                     prop: 'pipeSectionName_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管段型号',
                   prop: 'pipeSpecMode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段型号',
                   highSelectAttrs:{
                     prop: 'pipeSpecMode_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '工序名称',
                   prop: 'processName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工序名称',
                   highSelectAttrs:{
                     prop: 'processName_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '船号',
                   prop: 'shipNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入船号',
                   highSelectAttrs:{
                     prop: 'shipNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '项目号',
                   prop: 'projectNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入项目号',
                   highSelectAttrs:{
                     prop: 'projectNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '计划状态', 
                   prop: 'workPlanStatus', 
                   el: 'select', 
@@ -128,6 +208,19 @@
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_BOOL 
                   }
                },
                {
                   label: '工艺流向编号',
                   prop: 'processRouteNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工艺流向编号',
                   highSelectAttrs:{
                     prop: 'processRouteNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   } 
                }, 
                { 
@@ -437,45 +530,6 @@
                   } 
                }, 
                { 
                   label: '船号',
                   prop: 'shipNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入船号',
                   highSelectAttrs:{
                     prop: 'shipNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '项目号',
                   prop: 'projectNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入项目号',
                   highSelectAttrs:{
                     prop: 'projectNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '工序名称',
                   prop: 'processName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工序名称',
                   highSelectAttrs:{
                     prop: 'processName_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管件编码', 
                   prop: 'pipeFittingCode', 
                   el: 'input', 
@@ -496,32 +550,6 @@
                   placeholder: '请输入顺序号', 
                   highSelectAttrs:{ 
                     prop: 'preSerialNumber_FilterMode', 
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管段编码',
                   prop: 'pipeSpecCode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段编码',
                   highSelectAttrs:{
                     prop: 'pipeSpecCode_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管段名称',
                   prop: 'pipeSectionName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段名称',
                   highSelectAttrs:{
                     prop: 'pipeSectionName_FilterMode',
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
@@ -579,19 +607,6 @@
                   placeholder: '请输入材质', 
                   highSelectAttrs:{ 
                     prop: 'material_FilterMode', 
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '工艺流向编号',
                   prop: 'processRouteNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工艺流向编号',
                   highSelectAttrs:{
                     prop: 'processRouteNumber_FilterMode',
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
@@ -733,93 +748,11 @@
    const check = isEqual(initiateData.value, data) 
    return check 
  } 
  const commonGetFormData=()=>{
    const data = {
      taskCode: formData.value.taskCode || '',
taskCode_FilterMode: formData.value.taskCode_FilterMode || '',
workPlanStatus: formData.value.workPlanStatus || '',
workPlanStatus_FilterMode: formData.value.workPlanStatus_FilterMode || '',
callMaterialStatus: formData.value.callMaterialStatus || '',
callMaterialStatus_FilterMode: formData.value.callMaterialStatus_FilterMode || '',
dataIdentifier: formData.value.dataIdentifier || '',
dataIdentifier_FilterMode: formData.value.dataIdentifier_FilterMode || '',
materialMode: formData.value.materialMode || '',
materialMode_FilterMode: formData.value.materialMode_FilterMode || '',
length: formData.value.length || '',
length_FilterMode: formData.value.length_FilterMode || '',
markingContent: formData.value.markingContent || '',
markingContent_FilterMode: formData.value.markingContent_FilterMode || '',
markingPosition: formData.value.markingPosition || '',
markingPosition_FilterMode: formData.value.markingPosition_FilterMode || '',
cuttingPosition: formData.value.cuttingPosition || '',
cuttingPosition_FilterMode: formData.value.cuttingPosition_FilterMode || '',
quantity: formData.value.quantity || '',
quantity_FilterMode: formData.value.quantity_FilterMode || '',
flangeThickness: formData.value.flangeThickness || '',
flangeThickness_FilterMode: formData.value.flangeThickness_FilterMode || '',
flangeInnerDiameter: formData.value.flangeInnerDiameter || '',
flangeInnerDiameter_FilterMode: formData.value.flangeInnerDiameter_FilterMode || '',
weldingHeatInput: formData.value.weldingHeatInput || '',
weldingHeatInput_FilterMode: formData.value.weldingHeatInput_FilterMode || '',
pipeAllowableStress: formData.value.pipeAllowableStress || '',
pipeAllowableStress_FilterMode: formData.value.pipeAllowableStress_FilterMode || '',
pipeDiameter: formData.value.pipeDiameter || '',
pipeDiameter_FilterMode: formData.value.pipeDiameter_FilterMode || '',
pipeWallThickness: formData.value.pipeWallThickness || '',
pipeWallThickness_FilterMode: formData.value.pipeWallThickness_FilterMode || '',
factoryCode: formData.value.factoryCode || '',
factoryCode_FilterMode: formData.value.factoryCode_FilterMode || '',
productCode: formData.value.productCode || '',
productCode_FilterMode: formData.value.productCode_FilterMode || '',
workstationCode: formData.value.workstationCode || '',
workstationCode_FilterMode: formData.value.workstationCode_FilterMode || '',
equipmentCode: formData.value.equipmentCode || '',
equipmentCode_FilterMode: formData.value.equipmentCode_FilterMode || '',
prodLineCode: formData.value.prodLineCode || '',
prodLineCode_FilterMode: formData.value.prodLineCode_FilterMode || '',
shipNumber: formData.value.shipNumber || '',
shipNumber_FilterMode: formData.value.shipNumber_FilterMode || '',
projectNumber: formData.value.projectNumber || '',
projectNumber_FilterMode: formData.value.projectNumber_FilterMode || '',
processName: formData.value.processName || '',
processName_FilterMode: formData.value.processName_FilterMode || '',
pipeFittingCode: formData.value.pipeFittingCode || '',
pipeFittingCode_FilterMode: formData.value.pipeFittingCode_FilterMode || '',
preSerialNumber: formData.value.preSerialNumber || '',
preSerialNumber_FilterMode: formData.value.preSerialNumber_FilterMode || '',
pipeSpecCode: formData.value.pipeSpecCode || '',
pipeSpecCode_FilterMode: formData.value.pipeSpecCode_FilterMode || '',
pipeSectionName: formData.value.pipeSectionName || '',
pipeSectionName_FilterMode: formData.value.pipeSectionName_FilterMode || '',
outerDiameter: formData.value.outerDiameter || '',
outerDiameter_FilterMode: formData.value.outerDiameter_FilterMode || '',
thickness: formData.value.thickness || '',
thickness_FilterMode: formData.value.thickness_FilterMode || '',
material: formData.value.material || '',
material_FilterMode: formData.value.material_FilterMode || '',
processRouteNumber: formData.value.processRouteNumber || '',
processRouteNumber_FilterMode: formData.value.processRouteNumber_FilterMode || '',
plannedStartTime: formData.value.plannedStartTime || '',
plannedEndTime: formData.value.plannedEndTime || '',
teamInfo: formData.value.teamInfo || '',
teamInfo_FilterMode: formData.value.teamInfo_FilterMode || '',
timestamp: formData.value.timestamp || '',
timestamp_FilterMode: formData.value.timestamp_FilterMode || '',
creationTime: formData.value.creationTime || '',
lastModificationTime: formData.value.lastModificationTime || '',
creatorName: formData.value.creatorName || '',
creatorName_FilterMode: formData.value.creatorName_FilterMode || '',
lastModifierName: formData.value.lastModifierName || '',
lastModifierName_FilterMode: formData.value.lastModifierName_FilterMode || '',
remark: formData.value.remark || '',
remark_FilterMode: formData.value.remark_FilterMode || '',
    }
    return data;
  }
  const onClose = (done: () => void) => { 
    if (visible.value) { 
      visible.value = false 
      const data =commonGetFormData();
      const data =collectFormDataForHighQuery(formItems,formData);
      ctx.emit('close', data) 
    } 
  } 
@@ -827,101 +760,22 @@
   * ç¡®è®¤æŸ¥è¯¢ 
   */ 
  const onConfirmQuery = async () => { 
    const data =commonGetFormData();
    const data =collectFormDataForHighQuery(formItems,formData);
    ctx.emit('confirmQuery', data) 
  } 
  /**
   * é‡ç½®å…¬å…±select查询
   */
  const onResetForHighSelect = async () => {
    formData.value.taskCode_FilterMode = 1
formData.value.workPlanStatus_FilterMode = 2
formData.value.callMaterialStatus_FilterMode = 2
formData.value.dataIdentifier_FilterMode = 1
formData.value.materialMode_FilterMode = 1
formData.value.length_FilterMode = 2
formData.value.markingContent_FilterMode = 1
formData.value.markingPosition_FilterMode = 2
formData.value.cuttingPosition_FilterMode = 2
formData.value.quantity_FilterMode = 2
formData.value.flangeThickness_FilterMode = 2
formData.value.flangeInnerDiameter_FilterMode = 2
formData.value.weldingHeatInput_FilterMode = 1
formData.value.pipeAllowableStress_FilterMode = 1
formData.value.pipeDiameter_FilterMode = 2
formData.value.pipeWallThickness_FilterMode = 2
formData.value.factoryCode_FilterMode = 1
formData.value.productCode_FilterMode = 1
formData.value.workstationCode_FilterMode = 1
formData.value.equipmentCode_FilterMode = 1
formData.value.prodLineCode_FilterMode = 1
formData.value.shipNumber_FilterMode = 1
formData.value.projectNumber_FilterMode = 1
formData.value.processName_FilterMode = 1
formData.value.pipeFittingCode_FilterMode = 1
formData.value.preSerialNumber_FilterMode = 1
formData.value.pipeSpecCode_FilterMode = 1
formData.value.pipeSectionName_FilterMode = 1
formData.value.outerDiameter_FilterMode = 2
formData.value.thickness_FilterMode = 2
formData.value.material_FilterMode = 1
formData.value.processRouteNumber_FilterMode = 1
formData.value.teamInfo_FilterMode = 1
formData.value.timestamp_FilterMode = 1
formData.value.creatorName_FilterMode = 1
formData.value.lastModifierName_FilterMode = 1
formData.value.remark_FilterMode = 1
  }
  /**
   * é‡ç½®æŸ¥è¯¢
   */
  const onReset = async () => {
    formData.value = {}
    onResetForHighSelect();//重置公共select查询
    formData.value.taskCode = ''
formData.value.workPlanStatus = ''
formData.value.callMaterialStatus = ''
formData.value.dataIdentifier = ''
formData.value.materialMode = ''
formData.value.length = ''
formData.value.markingContent = ''
formData.value.markingPosition = ''
formData.value.cuttingPosition = ''
formData.value.quantity = ''
formData.value.flangeThickness = ''
formData.value.flangeInnerDiameter = ''
formData.value.weldingHeatInput = ''
formData.value.pipeAllowableStress = ''
formData.value.pipeDiameter = ''
formData.value.pipeWallThickness = ''
formData.value.factoryCode = ''
formData.value.productCode = ''
formData.value.workstationCode = ''
formData.value.equipmentCode = ''
formData.value.prodLineCode = ''
formData.value.shipNumber = ''
formData.value.projectNumber = ''
formData.value.processName = ''
formData.value.pipeFittingCode = ''
formData.value.preSerialNumber = ''
formData.value.pipeSpecCode = ''
formData.value.pipeSectionName = ''
formData.value.outerDiameter = ''
formData.value.thickness = ''
formData.value.material = ''
formData.value.processRouteNumber = ''
formData.value.plannedStartTime = ''
formData.value.plannedEndTime = ''
formData.value.teamInfo = ''
formData.value.timestamp = ''
formData.value.creationTime = ''
formData.value.lastModificationTime = ''
formData.value.creatorName = ''
formData.value.lastModifierName = ''
formData.value.remark = ''
    //向父组件发送自定义事件
    ctx.emit('restQuery');
  }
    /**
    * é‡ç½®æŸ¥è¯¢ - ä¼˜åŒ–版
    */
    const onReset = async () => {
        // 1. æ¸…空所有基础字段(不包含过滤模式字段),应用基础字段初始值
        onResetForHighQuery(formItems,formData);
        // 2. ä½¿ç”¨åŽŸæœ‰æ–¹æ³•é‡ç½®è¿‡æ»¤æ¨¡å¼å­—æ®µ
        onResetForHighSelect(formItems,formData);
        // 3. å‘父组件发送自定义事件
        ctx.emit('restQuery');
    }
 
  const updateCheckData = () => { 
    initiateData.value = { 
@@ -954,7 +808,7 @@
 
  } 
  commonQueryEnumForFrom() 
  onResetForHighSelect();//重置公共select查询
  onResetForHighSelect(formItems,formData);//重置公共select查询
  /** 
   * å¼¹çª—打开获取详情 
   */ 
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
@@ -20,8 +20,23 @@
  width:160, 
}, 
  field: 'pipeSpecMode',
  title: '管段型号',
  width:160,
},
{
  field: 'processName', 
  title: '工序名称', 
  width:160,
},
{
  field: 'shipNumber',
  title: '船号',
  width:160,
},
{
  field: 'projectNumber',
  title: '项目号',
  width:160, 
}, 
@@ -32,6 +47,11 @@
  field: 'callMaterialStatusDesc', 
  title: '叫料状态', 
  width:160,
},
{
  field: 'processRouteNumber',
  title: '工艺流向编号',
  width:160, 
}, 
@@ -125,17 +145,6 @@
  width:160, 
}, 
  field: 'shipNumber',
  title: '船号',
  width:160,
},
{
  field: 'projectNumber',
  title: '项目号',
  width:160,
},
{
  field: 'pipeFittingCode', 
  title: '管件编码', 
  width:160, 
@@ -145,7 +154,6 @@
  title: '顺序号', 
  width:160, 
}, 
  field: 'outerDiameter', 
  title: '外径(mm)', 
@@ -159,11 +167,6 @@
  field: 'material', 
  title: '材质', 
  width:160,
},
{
  field: 'processRouteNumber',
  title: '工艺流向编号',
  width:160, 
}, 
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
@@ -27,6 +27,8 @@
import {   
  FILTER_MODE_OPTIONS_STRING 
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';  
// å¼•入公共高级查询工具文件
import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils';
 
interface RenderTableType { 
  url?: string 
@@ -69,17 +71,12 @@
 
    //定义高级查询引用 
   const workPlanQueryDrawerRef=ref(null); 
    // æ–°å¢žçš„æŸ¥è¯¢æ¡ä»¶
    const queryForm = ref({
      searchVal: '',
      str_searchFormInputAttrs:[],
      searchVal_FilterMode:''
    })
    //定义整体模糊查询的列数组(注意:必须大小写跟后端的实体类属性名一致,否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
     'TaskCode','DataIdentifier','MaterialMode','MarkingContent','WeldingHeatInput','PipeAllowableStress','FactoryCode','ProductCode','WorkstationCode','EquipmentCode','ProdLineCode','ShipNumber','ProjectNumber','ProcessName','PipeFittingCode','PreSerialNumber','PipeSpecCode','PipeSectionName','Material','ProcessRouteNumber','TeamInfo','Timestamp','CreatorName','LastModifierName','Remark'
     'TaskCode','PipeSpecCode','PipeSectionName','PipeSpecMode','ProcessName','ShipNumber','ProjectNumber','ProcessRouteNumber','DataIdentifier','MaterialMode','MarkingContent','WeldingHeatInput','PipeAllowableStress','FactoryCode','ProductCode','WorkstationCode','EquipmentCode','ProdLineCode','PipeFittingCode','PreSerialNumber','Material','TeamInfo','Timestamp','CreatorName','LastModifierName','Remark'
    ]); 
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/原料标识/原料型号/打码内容/法兰公称压力/法兰冲码内容/工厂代码/产品代码/工位代码/设备代码/产线编码/船号/项目号/工序名称/管件编码/顺序号/管段编码/管段名称/材质/工艺流向编号/班组信息/时间戳/创建人/修改人/备注');
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/管段编码/管段名称/管段型号/工序名称/船号/项目号/工艺流向编号/原料标识/原料型号/打码内容/法兰公称压力/法兰冲码内容/工厂代码/产品代码/工位代码/设备代码/产线编码/管件编码/顺序号/材质/班组信息/时间戳/创建人/修改人/备注');
     
 
    // åŠ¨æ€æžšä¸¾é€‰é¡¹ 
@@ -111,69 +108,40 @@
      } 
    } 
 
    // å®šä¹‰å“åº”式查询数据
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
    /*******************************************************[高级查询]开始********************************************************************************* */
    // ç»„件挂载时获取枚举数据  
    onMounted(() => {  
      fetchEnumData()  
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
      resetQuery();
    })  
    // æ–°ç‰ˆçš„æŸ¥è¯¢æ–¹æ³•(主页面中的按钮【查询】)
    const handleQueryForMain = async () => {
      _curHighQueryData.value.searchVal = queryForm.value.searchVal;
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
      tableRef.value.getList(_curHighQueryData.value)
    }
    // æ–°ç‰ˆçš„æŸ¥è¯¢æ–¹æ³•(高级查询中的按钮【查询】)
    const handleQuery = async (extraParams = {}) => {
      let filteredData = commonGetHighQueryForm(extraParams);
      commonSaveCurHighQueryData(filteredData);
      tableRef.value.getList(filteredData)
    }
    // æ–°ç‰ˆçš„æŸ¥è¯¢é‡ç½®
    const resetQuery = () => {
      queryForm.value.searchVal = ''
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
    }
     //新版的导出方法
     const handleExport=()=>{
      onExport(_curHighQueryData.value);
    }
    // æ–°ç‰ˆçš„æŸ¥è¯¢å¼¹å‡ºæ¡†å…³é—­æ–¹æ³•
    const closeQuery = (extraParams={}) => {
      let filteredData = commonGetHighQueryForm(extraParams);
      console.log("closeQuery方法");
      console.log(filteredData);
      commonSaveCurHighQueryData(filteredData);
    }
    //保存查询值
    const commonSaveCurHighQueryData=(filteredData={})=>{
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
    }
     //获取高级查询弹出框的查询值
     const commonGetHighQueryForm=(extraParams={})=>{
      // è¿‡æ»¤æŽ‰ undefined çš„值
      let filteredData = Object.assign(
        {},
        ...Object.entries(extraParams).map(([key, value]) =>
          value !== undefined ? { [key]: value } : {}
        )
      )
      //组合模糊查询
      filteredData.searchVal = queryForm.value.searchVal
      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
      return filteredData;
    }
    // æ–°å¢žçš„æŸ¥è¯¢æ¡ä»¶
    const queryForm = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
    // å®šä¹‰å“åº”式查询数据
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
    // æ–°ç‰ˆçš„æŸ¥è¯¢æ–¹æ³•(主页面中的按钮【查询】)
    const handleQueryForMain = async () => {
      setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
      tableRef.value.getList(_curHighQueryData.value)
    }
    // æ–°ç‰ˆçš„æŸ¥è¯¢æ–¹æ³•(高级查询中的按钮【查询】)
    const handleQuery = async (extraParams = {}) => {
      let filteredData = GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData);
      tableRef.value.getList(filteredData)
    }
    // æ–°ç‰ˆçš„æŸ¥è¯¢é‡ç½®
    const resetQuery = () => {
      initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING);
      setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
    }
     //新版的导出方法
     const handleExport=()=>{
      onExport(_curHighQueryData.value);
    }
    // æ–°ç‰ˆçš„æŸ¥è¯¢å¼¹å‡ºæ¡†å…³é—­æ–¹æ³•
    const closeQuery = (extraParams={}) => {
      GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData);
    }
    /*******************************************************[高级查询]结束********************************************************************************* */
 
    /** 
     * @returns è¡¨æ ¼ 
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
@@ -98,6 +98,48 @@
              rules: [{required: true, message: '任务编码不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '管段编码',
                   prop: 'pipeSpecCode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段编码',
                },
                {
                   label: '管段名称',
                   prop: 'pipeSectionName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段名称',
                },
                {
                   label: '管段型号',
                   prop: 'pipeSpecMode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段型号',
                },
                {
                   label: '工序名称',
                   prop: 'processName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工序名称',
                },
                {
                   label: '船号',
                   prop: 'shipNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入船号',
                },
                {
                   label: '项目号',
                   prop: 'projectNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入项目号',
                },
                {
                   label: '计划状态', 
                   prop: 'workPlanStatus', 
                   el: 'select', 
@@ -116,6 +158,13 @@
                   //disabled: disabled, 
                   placeholder: '请输入叫料状态', 
              rules: [{required: true, message: '叫料状态不能为空', trigger: 'blur' }], 
                },
                {
                   label: '工艺流向编号',
                   prop: 'processRouteNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工艺流向编号',
                }, 
                { 
                   label: '原料标识', 
@@ -324,27 +373,6 @@
                   placeholder: '请输入产线编码', 
                }, 
                { 
                   label: '船号',
                   prop: 'shipNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入船号',
                },
                {
                   label: '项目号',
                   prop: 'projectNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入项目号',
                },
                {
                   label: '工序名称',
                   prop: 'processName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工序名称',
                },
                {
                   label: '管件编码', 
                   prop: 'pipeFittingCode', 
                   el: 'input', 
@@ -357,20 +385,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入顺序号', 
                },
                {
                   label: '管段编码',
                   prop: 'pipeSpecCode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段编码',
                },
                {
                   label: '管段名称',
                   prop: 'pipeSectionName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段名称',
                }, 
                { 
                   label: '外径(mm)', 
@@ -412,13 +426,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入材质', 
                },
                {
                   label: '工艺流向编号',
                   prop: 'processRouteNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工艺流向编号',
                }, 
                { 
                   label: '计划开始时间', 
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx
@@ -116,6 +116,84 @@
                   } 
                }, 
                { 
                   label: '管段编码',
                   prop: 'pipeSpecCode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段编码',
                   highSelectAttrs:{
                     prop: 'pipeSpecCode_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管段名称',
                   prop: 'pipeSectionName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段名称',
                   highSelectAttrs:{
                     prop: 'pipeSectionName_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管段型号',
                   prop: 'pipeSpecMode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段型号',
                   highSelectAttrs:{
                     prop: 'pipeSpecMode_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '工序名称',
                   prop: 'processName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工序名称',
                   highSelectAttrs:{
                     prop: 'processName_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '船号',
                   prop: 'shipNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入船号',
                   highSelectAttrs:{
                     prop: 'shipNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '项目号',
                   prop: 'projectNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入项目号',
                   highSelectAttrs:{
                     prop: 'projectNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '计划状态', 
                   prop: 'workPlanStatus', 
                   el: 'select', 
@@ -143,6 +221,19 @@
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_BOOL 
                   }
                },
                {
                   label: '工艺流向编号',
                   prop: 'processRouteNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工艺流向编号',
                   highSelectAttrs:{
                     prop: 'processRouteNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   } 
                }, 
                { 
@@ -452,45 +543,6 @@
                   } 
                }, 
                { 
                   label: '船号',
                   prop: 'shipNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入船号',
                   highSelectAttrs:{
                     prop: 'shipNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '项目号',
                   prop: 'projectNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入项目号',
                   highSelectAttrs:{
                     prop: 'projectNumber_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '工序名称',
                   prop: 'processName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工序名称',
                   highSelectAttrs:{
                     prop: 'processName_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管件编码', 
                   prop: 'pipeFittingCode', 
                   el: 'input', 
@@ -511,32 +563,6 @@
                   placeholder: '请输入顺序号', 
                   highSelectAttrs:{ 
                     prop: 'preSerialNumber_FilterMode', 
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管段编码',
                   prop: 'pipeSpecCode',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段编码',
                   highSelectAttrs:{
                     prop: 'pipeSpecCode_FilterMode',
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '管段名称',
                   prop: 'pipeSectionName',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入管段名称',
                   highSelectAttrs:{
                     prop: 'pipeSectionName_FilterMode',
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
@@ -594,19 +620,6 @@
                   placeholder: '请输入材质', 
                   highSelectAttrs:{ 
                     prop: 'material_FilterMode', 
                     el: 'select',
                     placeholder: '请选择',
                     options:FILTER_MODE_OPTIONS_STRING
                   }
                },
                {
                   label: '工艺流向编号',
                   prop: 'processRouteNumber',
                   el: 'input',
                   //disabled: disabled,
                   placeholder: '请输入工艺流向编号',
                   highSelectAttrs:{
                     prop: 'processRouteNumber_FilterMode',
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/Config.ts
@@ -15,6 +15,36 @@
  width:160, 
}, 
  field: 'pipeSpecCode',
  title: '管段编码',
  width:160,
},
{
  field: 'pipeSectionName',
  title: '管段名称',
  width:160,
},
{
  field: 'pipeSpecMode',
  title: '管段型号',
  width:160,
},
{
  field: 'processName',
  title: '工序名称',
  width:160,
},
{
  field: 'shipNumber',
  title: '船号',
  width:160,
},
{
  field: 'projectNumber',
  title: '项目号',
  width:160,
},
{
  field: 'workPlanStatusDesc', 
  title: '计划状态', 
  width:160, 
@@ -22,6 +52,11 @@
  field: 'callMaterialStatusDesc', 
  title: '叫料状态', 
  width:160,
},
{
  field: 'processRouteNumber',
  title: '工艺流向编号',
  width:160, 
}, 
@@ -115,21 +150,6 @@
  width:160, 
}, 
  field: 'shipNumber',
  title: '船号',
  width:160,
},
{
  field: 'projectNumber',
  title: '项目号',
  width:160,
},
{
  field: 'processName',
  title: '工序名称',
  width:160,
},
{
  field: 'pipeFittingCode', 
  title: '管件编码', 
  width:160, 
@@ -137,16 +157,6 @@
  field: 'preSerialNumber', 
  title: '顺序号', 
  width:160,
},
{
  field: 'pipeSpecCode',
  title: '管段编码',
  width:160,
},
{
  field: 'pipeSectionName',
  title: '管段名称',
  width:160, 
}, 
@@ -162,11 +172,6 @@
  field: 'material', 
  title: '材质', 
  width:160,
},
{
  field: 'processRouteNumber',
  title: '工艺流向编号',
  width:160, 
}, 
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
@@ -74,9 +74,9 @@
     
    //定义整体模糊查询的列数组(注意:必须大小写跟后端的实体类属性名一致,否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
     'Son_TaskCode','TaskCode','DataIdentifier','MaterialMode','MarkingContent','WeldingHeatInput','PipeAllowableStress','FactoryCode','ProductCode','WorkstationCode','EquipmentCode','ProdLineCode','ShipNumber','ProjectNumber','ProcessName','PipeFittingCode','PreSerialNumber','PipeSpecCode','PipeSectionName','Material','ProcessRouteNumber','TeamInfo','Timestamp','CreatorName','LastModifierName','Remark'
     'Son_TaskCode','TaskCode','PipeSpecCode','PipeSectionName','PipeSpecMode','ProcessName','ShipNumber','ProjectNumber','ProcessRouteNumber','DataIdentifier','MaterialMode','MarkingContent','WeldingHeatInput','PipeAllowableStress','FactoryCode','ProductCode','WorkstationCode','EquipmentCode','ProdLineCode','PipeFittingCode','PreSerialNumber','Material','TeamInfo','Timestamp','CreatorName','LastModifierName','Remark'
    ]); 
    const searchFormInputAttrs_Placeholder = ref('请输入子任务编码/任务编码/原料标识/原料型号/打码内容/法兰公称压力/法兰冲码内容/工厂代码/产品代码/工位代码/设备代码/产线编码/船号/项目号/工序名称/管件编码/顺序号/管段编码/管段名称/材质/工艺流向编号/班组信息/时间戳/创建人/修改人/备注');
    const searchFormInputAttrs_Placeholder = ref('请输入子任务编码/任务编码/管段编码/管段名称/管段型号/工序名称/船号/项目号/工艺流向编号/原料标识/原料型号/打码内容/法兰公称压力/法兰冲码内容/工厂代码/产品代码/工位代码/设备代码/产线编码/管件编码/顺序号/材质/班组信息/时间戳/创建人/修改人/备注');
     
 
    // åŠ¨æ€æžšä¸¾é€‰é¡¹ 
PipeLineLems/pipelinelems_web/vite.lib.config.ts
@@ -69,7 +69,8 @@
const library: any = getWidgetNames.map((name) => {
  return {
    outDir: 'dist',
    //outDir: 'dist',
    outDir: 'D:/Program Files/CMS Editor/host/wwwroot/widgets',//发布到指定目录中
    target: 'ES2022',
    mode: 'development',
    rollupOptions: {
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
@@ -55,6 +55,66 @@
        public SearchFilterModeEnum TaskCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string PipeSpecMode { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSpecMode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string ProcessName { get; set; }
        /// <summary>
        /// å·¥åºåç§°-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProcessName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }
        /// <summary>
        /// èˆ¹å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ShipNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProjectNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        public WorkPlanStatusEnum?  WorkPlanStatus { get; set; }
@@ -73,6 +133,16 @@
        /// å«æ–™çŠ¶æ€-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum CallMaterialStatus_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// åŽŸæ–™æ ‡è¯†
@@ -255,36 +325,6 @@
        public SearchFilterModeEnum ProdLineCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }
        /// <summary>
        /// èˆ¹å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ShipNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProjectNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string ProcessName { get; set; }
        /// <summary>
        /// å·¥åºåç§°-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProcessName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡ä»¶ç¼–码
        /// </summary>
        public string PipeFittingCode { get; set; }
@@ -303,26 +343,6 @@
        /// é¡ºåºå·-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum PreSerialNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å¤–径(mm)
@@ -353,16 +373,6 @@
        /// æè´¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Material_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs
@@ -15,6 +15,36 @@
        public string TaskCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string? PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string? PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string? PipeSpecMode { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string? ProcessName { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string? ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string? ProjectNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        public WorkPlanStatusEnum WorkPlanStatus { get; set; }
@@ -23,6 +53,11 @@
        /// å«æ–™çŠ¶æ€
        /// </summary>
        public CallMaterialStatusEnum CallMaterialStatus { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string? ProcessRouteNumber { get; set; }
        /// <summary>
        /// åŽŸæ–™æ ‡è¯†
@@ -115,21 +150,6 @@
        public string? ProdLineCode { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string? ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string? ProjectNumber { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string? ProcessName { get; set; }
        /// <summary>
        /// ç®¡ä»¶ç¼–码
        /// </summary>
        public string? PipeFittingCode { get; set; }
@@ -138,16 +158,6 @@
        /// é¡ºåºå·
        /// </summary>
        public string? PreSerialNumber { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string? PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string? PipeSectionName { get; set; }
        /// <summary>
        /// å¤–径(mm)
@@ -163,11 +173,6 @@
        /// æè´¨
        /// </summary>
        public string? Material { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string? ProcessRouteNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs
@@ -18,6 +18,36 @@
        public string TaskCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string? PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string? PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string? PipeSpecMode { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string? ProcessName { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string? ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string? ProjectNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        public WorkPlanStatusEnum WorkPlanStatus { get; set; }
@@ -47,6 +77,11 @@
                return GetEnumDescriptionUtil.GetEnumDescription(CallMaterialStatus); 
            } 
        } 
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string? ProcessRouteNumber { get; set; }
        /// <summary>
        /// åŽŸæ–™æ ‡è¯†
        /// </summary>
@@ -138,21 +173,6 @@
        public string? ProdLineCode { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string? ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string? ProjectNumber { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string? ProcessName { get; set; }
        /// <summary>
        /// ç®¡ä»¶ç¼–码
        /// </summary>
        public string? PipeFittingCode { get; set; }
@@ -161,16 +181,6 @@
        /// é¡ºåºå·
        /// </summary>
        public string? PreSerialNumber { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string? PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string? PipeSectionName { get; set; }
        /// <summary>
        /// å¤–径(mm)
@@ -186,11 +196,6 @@
        /// æè´¨
        /// </summary>
        public string? Material { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string? ProcessRouteNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
@@ -17,6 +17,42 @@
        public string TaskCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        [ExcelColumn(Name = "管段编码", Width = 25)]
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        [ExcelColumn(Name = "管段名称", Width = 25)]
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        [ExcelColumn(Name = "管段型号", Width = 25)]
        public string PipeSpecMode { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        [ExcelColumn(Name = "工序名称", Width = 25)]
        public string ProcessName { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        [ExcelColumn(Name = "船号", Width = 25)]
        public string ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        [ExcelColumn(Name = "项目号", Width = 25)]
        public string ProjectNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        [ExcelColumn(Name = "计划状态", Width = 25)]
@@ -27,6 +63,12 @@
        /// </summary>
        [ExcelColumn(Name = "叫料状态", Width = 25)]
        public CallMaterialStatusEnum CallMaterialStatus { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        [ExcelColumn(Name = "工艺流向编号", Width = 25)]
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// åŽŸæ–™æ ‡è¯†
@@ -137,24 +179,6 @@
        public string ProdLineCode { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        [ExcelColumn(Name = "船号", Width = 25)]
        public string ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        [ExcelColumn(Name = "项目号", Width = 25)]
        public string ProjectNumber { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        [ExcelColumn(Name = "工序名称", Width = 25)]
        public string ProcessName { get; set; }
        /// <summary>
        /// ç®¡ä»¶ç¼–码
        /// </summary>
        [ExcelColumn(Name = "管件编码", Width = 25)]
@@ -165,18 +189,6 @@
        /// </summary>
        [ExcelColumn(Name = "顺序号", Width = 25)]
        public string PreSerialNumber { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        [ExcelColumn(Name = "管段编码", Width = 25)]
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        [ExcelColumn(Name = "管段名称", Width = 25)]
        public string PipeSectionName { get; set; }
        /// <summary>
        /// å¤–径(mm)
@@ -195,12 +207,6 @@
        /// </summary>
        [ExcelColumn(Name = "材质", Width = 25)]
        public string Material { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        [ExcelColumn(Name = "工艺流向编号", Width = 25)]
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
@@ -84,6 +84,11 @@
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string? PipeSpecMode { get; set; }
        /// <summary>
        /// å¤–径
        /// </summary>
        public string OuterDiameter { get; set; }
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs
@@ -65,6 +65,66 @@
        public SearchFilterModeEnum TaskCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string PipeSpecMode { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSpecMode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string ProcessName { get; set; }
        /// <summary>
        /// å·¥åºåç§°-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProcessName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }
        /// <summary>
        /// èˆ¹å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ShipNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProjectNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        public WorkPlanStatusEnum?  WorkPlanStatus { get; set; }
@@ -83,6 +143,16 @@
        /// å«æ–™çŠ¶æ€-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum CallMaterialStatus_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// åŽŸæ–™æ ‡è¯†
@@ -265,36 +335,6 @@
        public SearchFilterModeEnum ProdLineCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }
        /// <summary>
        /// èˆ¹å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ShipNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProjectNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string ProcessName { get; set; }
        /// <summary>
        /// å·¥åºåç§°-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProcessName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡ä»¶ç¼–码
        /// </summary>
        public string PipeFittingCode { get; set; }
@@ -313,26 +353,6 @@
        /// é¡ºåºå·-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum PreSerialNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å¤–径(mm)
@@ -363,16 +383,6 @@
        /// æè´¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Material_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号-查询关系运算符
        /// </summary>
        public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskCreateOrUpdateDtoBase.cs
@@ -20,6 +20,36 @@
        public string TaskCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string? PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string? PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string? PipeSpecMode { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string? ProcessName { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string? ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string? ProjectNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        public WorkPlanStatusEnum WorkPlanStatus { get; set; }
@@ -28,6 +58,11 @@
        /// å«æ–™çŠ¶æ€
        /// </summary>
        public CallMaterialStatusEnum CallMaterialStatus { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string? ProcessRouteNumber { get; set; }
        /// <summary>
        /// åŽŸæ–™æ ‡è¯†
@@ -120,21 +155,6 @@
        public string? ProdLineCode { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string? ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string? ProjectNumber { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string? ProcessName { get; set; }
        /// <summary>
        /// ç®¡ä»¶ç¼–码
        /// </summary>
        public string? PipeFittingCode { get; set; }
@@ -143,16 +163,6 @@
        /// é¡ºåºå·
        /// </summary>
        public string? PreSerialNumber { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string? PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string? PipeSectionName { get; set; }
        /// <summary>
        /// å¤–径(mm)
@@ -168,11 +178,6 @@
        /// æè´¨
        /// </summary>
        public string? Material { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string? ProcessRouteNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskDto.cs
@@ -23,6 +23,36 @@
        public string TaskCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string? PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string? PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string? PipeSpecMode { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string? ProcessName { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string? ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string? ProjectNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        public WorkPlanStatusEnum WorkPlanStatus { get; set; }
@@ -52,6 +82,11 @@
                return GetEnumDescriptionUtil.GetEnumDescription(CallMaterialStatus); 
            } 
        } 
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string? ProcessRouteNumber { get; set; }
        /// <summary>
        /// åŽŸæ–™æ ‡è¯†
        /// </summary>
@@ -143,21 +178,6 @@
        public string? ProdLineCode { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string? ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string? ProjectNumber { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string? ProcessName { get; set; }
        /// <summary>
        /// ç®¡ä»¶ç¼–码
        /// </summary>
        public string? PipeFittingCode { get; set; }
@@ -166,16 +186,6 @@
        /// é¡ºåºå·
        /// </summary>
        public string? PreSerialNumber { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string? PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string? PipeSectionName { get; set; }
        /// <summary>
        /// å¤–径(mm)
@@ -191,11 +201,6 @@
        /// æè´¨
        /// </summary>
        public string? Material { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string? ProcessRouteNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs
@@ -23,6 +23,42 @@
        public string TaskCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        [ExcelColumn(Name = "管段编码", Width = 25)]
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        [ExcelColumn(Name = "管段名称", Width = 25)]
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        [ExcelColumn(Name = "管段型号", Width = 25)]
        public string PipeSpecMode { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        [ExcelColumn(Name = "工序名称", Width = 25)]
        public string ProcessName { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        [ExcelColumn(Name = "船号", Width = 25)]
        public string ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        [ExcelColumn(Name = "项目号", Width = 25)]
        public string ProjectNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        [ExcelColumn(Name = "计划状态", Width = 25)]
@@ -33,6 +69,12 @@
        /// </summary>
        [ExcelColumn(Name = "叫料状态", Width = 25)]
        public CallMaterialStatusEnum CallMaterialStatus { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        [ExcelColumn(Name = "工艺流向编号", Width = 25)]
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// åŽŸæ–™æ ‡è¯†
@@ -143,24 +185,6 @@
        public string ProdLineCode { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        [ExcelColumn(Name = "船号", Width = 25)]
        public string ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        [ExcelColumn(Name = "项目号", Width = 25)]
        public string ProjectNumber { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        [ExcelColumn(Name = "工序名称", Width = 25)]
        public string ProcessName { get; set; }
        /// <summary>
        /// ç®¡ä»¶ç¼–码
        /// </summary>
        [ExcelColumn(Name = "管件编码", Width = 25)]
@@ -171,18 +195,6 @@
        /// </summary>
        [ExcelColumn(Name = "顺序号", Width = 25)]
        public string PreSerialNumber { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        [ExcelColumn(Name = "管段编码", Width = 25)]
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        [ExcelColumn(Name = "管段名称", Width = 25)]
        public string PipeSectionName { get; set; }
        /// <summary>
        /// å¤–径(mm)
@@ -201,12 +213,6 @@
        /// </summary>
        [ExcelColumn(Name = "材质", Width = 25)]
        public string Material { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        [ExcelColumn(Name = "工艺流向编号", Width = 25)]
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
@@ -151,42 +151,10 @@
        updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
        updateObj.TaskCode = input.TaskCode;
        updateObj.WorkPlanStatus = input.WorkPlanStatus;
        updateObj.CallMaterialStatus = input.CallMaterialStatus;
        updateObj.DataIdentifier = input.DataIdentifier;
        updateObj.MaterialMode = input.MaterialMode;
        updateObj.Length = input.Length;
        updateObj.MarkingContent = input.MarkingContent;
        updateObj.MarkingPosition = input.MarkingPosition;
        updateObj.CuttingPosition = input.CuttingPosition;
        updateObj.Quantity = input.Quantity;
        updateObj.FlangeThickness = input.FlangeThickness;
        updateObj.FlangeInnerDiameter = input.FlangeInnerDiameter;
        updateObj.WeldingHeatInput = input.WeldingHeatInput;
        updateObj.PipeAllowableStress = input.PipeAllowableStress;
        updateObj.PipeDiameter = input.PipeDiameter;
        updateObj.PipeWallThickness = input.PipeWallThickness;
        updateObj.FactoryCode = input.FactoryCode;
        updateObj.ProductCode = input.ProductCode;
        updateObj.WorkstationCode = input.WorkstationCode;
        updateObj.EquipmentCode = input.EquipmentCode;
        // æ‰¹é‡èµ‹å€¼æ‰€æœ‰å¯æ˜ å°„字段(通过匿名对象)
        updateObj = ObjectMapper.Map(input, updateObj); // ç­‰æ•ˆäºŽæ‰‹åŠ¨èµ‹å€¼æ‰€æœ‰åŒ¹é…å­—æ®µ
        updateObj.ProcessName = input.ProcessName;
        updateObj.PipeFittingCode = input.PipeFittingCode;
        updateObj.PreSerialNumber = input.PreSerialNumber;
        updateObj.PipeSpecCode = input.PipeSpecCode;
        updateObj.PipeSectionName = input.PipeSectionName;
        updateObj.OuterDiameter = input.OuterDiameter;
        updateObj.Thickness = input.Thickness;
        updateObj.Material = input.Material;
        updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
        updateObj.PlannedStartTime = input.PlannedStartTime;
        updateObj.PlannedEndTime = input.PlannedEndTime;
        updateObj.TeamInfo = input.TeamInfo;
        updateObj.Timestamp = input.Timestamp;
        updateObj.Remark = input.Remark;
        updateObj.LastModifierName = input.LastModifierName;//修改人
        await _workPlanRepository.UpdateAsync(updateObj);
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs
@@ -25,6 +25,7 @@
         * into multiple profile classes for a better organization. */
        CreateMap<WorkPlan, WorkPlanDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<WorkPlanCreateDto, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<WorkPlanUpdateDto, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWorkPlanInput, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<WorkPlanImportModel, WorkPlanCreateDto>(MemberList.None);
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
@@ -27,7 +27,6 @@
 
        CreateMap<WorkTaskImportModel, WorkTaskCreateDto>(MemberList.None); 
        CreateMap<WorkTaskImportModel, WorkTaskUpdateDto>(MemberList.None); 
        CreateMap<WorkTaskImportModel, WorkTask>(MemberList.None);
        CreateMap<WorkTaskImportModel, WorkTask>(MemberList.None);
    } 
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
@@ -17,6 +17,36 @@
        public string TaskCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string PipeSpecMode { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string ProcessName { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        public WorkPlanStatusEnum WorkPlanStatus { get; set; }
@@ -25,6 +55,11 @@
        /// å«æ–™çŠ¶æ€
        /// </summary>
        public CallMaterialStatusEnum CallMaterialStatus { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string ProcessRouteNumber { get; set; }
        #region åŽŸæ–™ç®¡ä¿¡æ¯
@@ -149,20 +184,9 @@
        /// </summary>
        public string ProdLineCode { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string ProcessName { get; set; }
        /// <summary>
        /// ç®¡ä»¶ç¼–码
@@ -176,15 +200,7 @@
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string PipeSectionName { get; set; }
        /// <summary>
        /// å¤–径(mm)
@@ -217,10 +233,7 @@
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkTask/WorkTask.cs
@@ -24,6 +24,36 @@
        public string TaskCode { get; set; }
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string PipeSectionName { get; set; }
        /// <summary>
        /// ç®¡æ®µåž‹å·
        /// </summary>
        public string PipeSpecMode { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string ProcessName { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’状态
        /// </summary>
        public WorkPlanStatusEnum WorkPlanStatus { get; set; }
@@ -32,6 +62,11 @@
        /// å«æ–™çŠ¶æ€
        /// </summary>
        public CallMaterialStatusEnum CallMaterialStatus { get; set; }
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string ProcessRouteNumber { get; set; }
        #region åŽŸæ–™ç®¡ä¿¡æ¯
@@ -156,20 +191,9 @@
        /// </summary>
        public string ProdLineCode { get; set; }
        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }
        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }
        /// <summary>
        /// å·¥åºåç§°
        /// </summary>
        public string ProcessName { get; set; }
        /// <summary>
        /// ç®¡ä»¶ç¼–码
@@ -183,15 +207,7 @@
        /// <summary>
        /// ç®¡æ®µç¼–码
        /// </summary>
        public string PipeSpecCode { get; set; }
        /// <summary>
        /// ç®¡æ®µåç§°
        /// </summary>
        public string PipeSectionName { get; set; }
        /// <summary>
        /// å¤–径(mm)
@@ -224,10 +240,7 @@
        /// <summary>
        /// å·¥è‰ºæµå‘编号
        /// </summary>
        public string ProcessRouteNumber { get; set; }
        /// <summary>
        /// è®¡åˆ’开始时间
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs
@@ -73,6 +73,7 @@
            b.Property(x => x.PreSerialNumber).HasMaxLength(256).HasComment("顺序号");
            b.Property(x => x.PipeSpecCode).HasMaxLength(256).HasComment("管段编码");
            b.Property(x => x.PipeSectionName).HasMaxLength(256).HasComment("管段名称");
            b.Property(x => x.PipeSpecMode).HasMaxLength(256).HasComment("管段型号");
            b.Property(x => x.OuterDiameter).HasColumnType("decimal(18,2)").HasComment("外径(mm)");
            b.Property(x => x.Thickness).HasColumnType("decimal(18,2)").HasComment("壁厚(mm)");
            b.Property(x => x.Material).HasMaxLength(256).HasComment("材质");
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkTask.cs
@@ -75,6 +75,7 @@
            b.Property(x => x.PreSerialNumber).HasMaxLength(256).HasComment("顺序号");
            b.Property(x => x.PipeSpecCode).HasMaxLength(256).HasComment("管段编码");
            b.Property(x => x.PipeSectionName).HasMaxLength(256).HasComment("管段名称");
            b.Property(x => x.PipeSpecMode).HasMaxLength(256).HasComment("管段型号");
            b.Property(x => x.OuterDiameter).HasColumnType("decimal(18,2)").HasComment("外径(mm)");
            b.Property(x => x.Thickness).HasColumnType("decimal(18,2)").HasComment("壁厚(mm)");
            b.Property(x => x.Material).HasMaxLength(256).HasComment("材质");
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.Designer.cs
ÎļþÃû´Ó PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250520032108_Update2.Designer.cs ÐÞ¸Ä
@@ -12,7 +12,7 @@
namespace CMS.Plugin.PipeLineLems.MySQL.Migrations
{
    [DbContext(typeof(CMSPluginDbContext))]
    [Migration("20250520032108_Update2")]
    [Migration("20250521014306_Update2")]
    partial class Update2
    {
        protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -562,6 +562,11 @@
                        .HasColumnType("varchar(256)")
                        .HasComment("管段编码");
                    b.Property<string>("PipeSpecMode")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("管段型号");
                    b.Property<decimal>("PipeWallThickness")
                        .HasColumnType("decimal(18,2)")
                        .HasComment("套管直径(mm)");
@@ -855,6 +860,11 @@
                        .HasColumnType("varchar(256)")
                        .HasComment("管段编码");
                    b.Property<string>("PipeSpecMode")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("管段型号");
                    b.Property<decimal>("PipeWallThickness")
                        .HasColumnType("decimal(18,2)")
                        .HasComment("套管直径(mm)");
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.cs
ÎļþÃû´Ó PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250520032108_Update2.cs ÐÞ¸Ä
@@ -152,8 +152,22 @@
                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
                    TaskCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false, comment: "任务编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSpecCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSectionName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSpecMode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段型号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProcessName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工序名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ShipNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "船号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProjectNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "项目号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    WorkPlanStatus = table.Column<int>(type: "int", nullable: false, comment: "计划状态"),
                    CallMaterialStatus = table.Column<int>(type: "int", nullable: false, comment: "叫料状态"),
                    ProcessRouteNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工艺流向编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    DataIdentifier = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "原料标识")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MaterialMode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "原料型号")
@@ -182,25 +196,13 @@
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProdLineCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "产线编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ShipNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "船号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProjectNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "项目号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProcessName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工序名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeFittingCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管件编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PreSerialNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "顺序号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSpecCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSectionName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    OuterDiameter = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "外径(mm)"),
                    Thickness = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "壁厚(mm)"),
                    Material = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "材质")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProcessRouteNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工艺流向编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PlannedStartTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "计划开始时间"),
                    PlannedEndTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "计划完成时间"),
@@ -254,8 +256,22 @@
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    TaskCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false, comment: "任务编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSpecCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSectionName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSpecMode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段型号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProcessName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工序名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ShipNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "船号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProjectNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "项目号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    WorkPlanStatus = table.Column<int>(type: "int", nullable: false, comment: "计划状态"),
                    CallMaterialStatus = table.Column<int>(type: "int", nullable: false, comment: "叫料状态"),
                    ProcessRouteNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工艺流向编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    DataIdentifier = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "原料标识")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MaterialMode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "原料型号")
@@ -284,25 +300,13 @@
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProdLineCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "产线编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ShipNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "船号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProjectNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "项目号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProcessName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工序名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeFittingCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管件编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PreSerialNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "顺序号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSpecCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PipeSectionName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "管段名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    OuterDiameter = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "外径(mm)"),
                    Thickness = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "壁厚(mm)"),
                    Material = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "材质")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProcessRouteNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工艺流向编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    PlannedStartTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "计划开始时间"),
                    PlannedEndTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "计划完成时间"),
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
@@ -560,6 +560,11 @@
                        .HasColumnType("varchar(256)")
                        .HasComment("管段编码");
                    b.Property<string>("PipeSpecMode")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("管段型号");
                    b.Property<decimal>("PipeWallThickness")
                        .HasColumnType("decimal(18,2)")
                        .HasComment("套管直径(mm)");
@@ -853,6 +858,11 @@
                        .HasColumnType("varchar(256)")
                        .HasComment("管段编码");
                    b.Property<string>("PipeSpecMode")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("管段型号");
                    b.Property<decimal>("PipeWallThickness")
                        .HasColumnType("decimal(18,2)")
                        .HasComment("套管直径(mm)");
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkTaskController.cs
@@ -1,18 +1,18 @@
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Framework.AspNetCore.Users;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask;
using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
using CmsQueryExtensions.Entitys;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using MiniExcelLibs;
using System.Reflection;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.PipeLineLems.Controller
{
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Framework.AspNetCore.Users;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask;
using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
using CmsQueryExtensions.Entitys;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using MiniExcelLibs;
using System.Reflection;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.PipeLineLems.Controller
{
    /// <summary> 
    /// ä½œä¸šä»»åŠ¡è¡¨æœåŠ¡ 
    /// </summary> 
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Resources/Templates/WorkTaskµ¼³öÄ£°å.xlsx
Binary files differ