From a3a2b238a2626ef8744e7a135f9ca2e2fbb5184c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 21 5月 2025 10:17:36 +0800
Subject: [PATCH] 优化
---
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx | 102 +--
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx | 175 +---
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx | 4
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs | 1
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskCreateOrUpdateDtoBase.cs | 65 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkTaskController.cs | 30
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs | 78 +-
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs | 130 ++-
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs | 5
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx | 169 ++--
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs | 78 +-
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx | 91 +-
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkTask/WorkTask.cs | 61 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs | 65 +
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts | 37
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkTask.cs | 1
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.Designer.cs | 12
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs | 65 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 10
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs | 65 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs | 38 -
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs | 130 ++-
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/Config.ts | 65 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs | 3
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskDto.cs | 65 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs | 1
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.cs | 52
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanQueryDrawer.tsx | 366 +++-------
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Resources/Templates/WorkTask导出模板.xlsx | 0
PipeLineLems/pipelinelems_web/vite.lib.config.ts | 3
30 files changed, 913 insertions(+), 1,054 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx
index 04e4add..6f55d90 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx
+++ b/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 {
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanQueryDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanQueryDrawer.tsx
index 5ba5020..0b8f33a 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanQueryDrawer.tsx
+++ b/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鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
index de41e2e..7b6a5e0 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
+++ b/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,
},
{
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
index befd88d..5c9b177 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
+++ b/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 琛ㄦ牸
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
index 23527b4..f4b02ad 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
+++ b/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: '璁″垝寮�濮嬫椂闂�',
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx
index beddd1a..3470564 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskQueryDrawer.tsx
+++ b/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
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/Config.ts b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/Config.ts
index 30f5152..c52afc0 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/Config.ts
+++ b/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,
},
{
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
index c67f201..75dc26f 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
+++ b/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('璇疯緭鍏ュ瓙浠诲姟缂栫爜/浠诲姟缂栫爜/绠℃缂栫爜/绠℃鍚嶇О/绠℃鍨嬪彿/宸ュ簭鍚嶇О/鑸瑰彿/椤圭洰鍙�/宸ヨ壓娴佸悜缂栧彿/鍘熸枡鏍囪瘑/鍘熸枡鍨嬪彿/鎵撶爜鍐呭/娉曞叞鍏О鍘嬪姏/娉曞叞鍐茬爜鍐呭/宸ュ巶浠ｇ爜/浜у搧浠ｇ爜/宸ヤ綅浠ｇ爜/璁惧浠ｇ爜/浜х嚎缂栫爜/绠′欢缂栫爜/椤哄簭鍙�/鏉愯川/鐝粍淇℃伅/鏃堕棿鎴�/鍒涘缓浜�/淇敼浜�/澶囨敞');
// 鍔ㄦ�佹灇涓鹃�夐」
diff --git a/PipeLineLems/pipelinelems_web/vite.lib.config.ts b/PipeLineLems/pipelinelems_web/vite.lib.config.ts
index 78633a2..146df54 100644
--- a/PipeLineLems/pipelinelems_web/vite.lib.config.ts
+++ b/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: {
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
index 55d440c..12db4f7 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs
index dfadd18..650cd7e 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs
index 5e9d63e..00573e9 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
index 1e829f4..3262483 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
index dfe7280..334a0e4 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
+++ b/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; }
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs
index e0248d3..b502565 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskCreateOrUpdateDtoBase.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskCreateOrUpdateDtoBase.cs
index 37dfe52..bee5cc9 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskCreateOrUpdateDtoBase.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskDto.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskDto.cs
index 19ffc2a..86dc574 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskDto.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs
index 6a6785a..6c6aa28 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
index 01ffc44..6ef527d 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
+++ b/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);
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs
index 0ad52a1..04db4ff 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs
+++ b/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);
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
index 23855aa..404ee5a 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
+++ b/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);
}
}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
index 6a12be7..a42e676 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkTask/WorkTask.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkTask/WorkTask.cs
index 68a7843..36b0485 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkTask/WorkTask.cs
+++ b/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>
/// 璁″垝寮�濮嬫椂闂�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs
index acac07c..968e8fd 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs
+++ b/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("鏉愯川");
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkTask.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkTask.cs
index 91324a2..1c0f06e 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkTask.cs
+++ b/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("鏉愯川");
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250520032108_Update2.Designer.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.Designer.cs
similarity index 98%
rename from PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250520032108_Update2.Designer.cs
rename to PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.Designer.cs
index b415230..55343b8 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250520032108_Update2.Designer.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_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)");
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250520032108_Update2.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.cs
similarity index 98%
rename from PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250520032108_Update2.cs
rename to PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_Update2.cs
index 991b6d5..fac38b0 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250520032108_Update2.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250521014306_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: "璁″垝瀹屾垚鏃堕棿"),
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
index 6135f3c..9f155a6 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
+++ b/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)");
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkTaskController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkTaskController.cs
index c0a68db..b65d03a 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkTaskController.cs
+++ b/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>
diff --git "a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Resources/Templates/WorkTask\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Resources/Templates/WorkTask\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index f5f9b43..a51d53a 100644
--- "a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Resources/Templates/WorkTask\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Resources/Templates/WorkTask\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3