diff --git a/src/locales/en.ts b/src/locales/en.ts
index 22386e12..51aa4648 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3754,7 +3754,7 @@ export default {
 
       tableNameColumn: 'Name',
       tableOrganizationColumn: 'Station',
-      tableMachineColumn: 'Machine',
+      tableMachineColumn: 'Related Collection Device',
       tableTeamColumn: 'Team',
       tableStartTimeColumn: 'Start Time',
       tableEndTimeColumn: 'End Time',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index cc40ad33..72ebcd63 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3600,7 +3600,7 @@ export default {
 
       tableNameColumn: '名称',
       tableOrganizationColumn: '工位',
-      tableMachineColumn: '机台',
+      tableMachineColumn: '关联采集设备',
       tableTeamColumn: '班组',
       tableStartTimeColumn: '开始时间',
       tableEndTimeColumn: '结束时间',
diff --git a/src/views/mes/organization/OrganizationForm.vue b/src/views/mes/organization/OrganizationForm.vue
index 87a88b73..74f247f6 100644
--- a/src/views/mes/organization/OrganizationForm.vue
+++ b/src/views/mes/organization/OrganizationForm.vue
@@ -113,6 +113,7 @@
             :key="item.id"
             :label="item.deviceName"
             :value="item.id"
+            :disabled="item.selected === true"
           />
         </el-select>
       </el-form-item>
@@ -162,6 +163,7 @@ const formData = ref({
   sort: undefined,
   workerUserId: undefined,
   machineId: undefined,
+  machineName: undefined,
   phone: undefined,
   email: undefined,
   isEnable: undefined,
@@ -169,7 +171,8 @@ const formData = ref({
   orgClass: undefined,
   orgType: undefined,
   isCode: undefined,
-  dvId: undefined
+  dvId: undefined,
+  dvName: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: t('FactoryModeling.FactoryStructure.validatorNameRequired'), trigger: 'blur' }],
@@ -198,12 +201,18 @@ const open = async (type: string, id?: number) => {
     deviceList.value = await DeviceLedgerApi.getDeviceLedgerListByNoUsed()
   } else {
     deviceList.value = await DeviceLedgerApi.getDeviceLedgerList2ByNoUsed(formData.value.machineId)
+    const exists = deviceList.value.some((item) => item.id === formData.value.machineId)
+    if (!exists && formData.value.machineName) {
+      deviceList.value.unshift({ id: formData.value.machineId, deviceName: formData.value.machineName } as DeviceLedgerVO)
+    }
   }
   //await getMachineComponentTree()
-  if (type == 'create' || typeof formData.value.dvId != 'number') {
-    dvList.value = await DeviceApi.getAvailableList()
-  } else {
-    dvList.value = await DeviceApi.getAvailableList()
+  dvList.value = await DeviceApi.getAvailableList()
+  if (type !== 'create' && typeof formData.value.dvId === 'number') {
+    const exists = dvList.value.some((item) => item.id === formData.value.dvId)
+    if (!exists && formData.value.dvName) {
+      dvList.value.unshift({ id: formData.value.dvId, deviceName: formData.value.dvName, selected: true } as DeviceVO)
+    }
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -242,6 +251,7 @@ const resetForm = () => {
     sort: 0,
     workerUserId: undefined,
     machineId: undefined,
+    machineName: undefined,
     phone: undefined,
     email: undefined,
     isEnable: undefined,
@@ -249,7 +259,8 @@ const resetForm = () => {
     orgClass: undefined,
     orgType: undefined,
     isCode: true,
-    dvId: undefined
+    dvId: undefined,
+    dvName: undefined
   }
   formRef.value?.resetFields()
 }