diff --git a/src/views/mes/md/workstation/WorkstationForm.vue b/src/views/mes/md/workstation/WorkstationForm.vue
index 71e1a9100..91b831274 100644
--- a/src/views/mes/md/workstation/WorkstationForm.vue
+++ b/src/views/mes/md/workstation/WorkstationForm.vue
@@ -38,15 +38,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="线边库" prop="warehouseId">
+          <el-form-item label="所属工序" prop="processId">
+            <ProProcessSelect
+              v-model="formData.processId"
+              placeholder="请选择所属工序"
+              clearable
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库" prop="warehouseId">
             <WmWarehouseSelect
               v-model="formData.warehouseId"
-              placeholder="请选择线边库"
+              placeholder="请选择仓库"
               clearable
               @change="handleWarehouseSelectChange"
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="库区" prop="locationId">
             <el-select
@@ -66,8 +78,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="库位" prop="areaId">
             <el-select
@@ -99,16 +109,6 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="所属工序" prop="processId">
-            <ProProcessSelect
-              v-model="formData.processId"
-              placeholder="请选择所属工序"
-              clearable
-              class="!w-1/1"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
diff --git a/src/views/mes/md/workstation/WorkstationMachineList.vue b/src/views/mes/md/workstation/WorkstationMachineList.vue
index 642c2f641..5485235a0 100644
--- a/src/views/mes/md/workstation/WorkstationMachineList.vue
+++ b/src/views/mes/md/workstation/WorkstationMachineList.vue
@@ -35,10 +35,9 @@
         v-loading="formLoading"
       >
         <el-form-item label="设备" prop="machineryId">
-          <!-- TODO @芋艿：对接设备下拉列表，等 DV 设备模块完成后对接 -->
-          <el-input-number
+          <DvMachinerySelect
             v-model="formData.machineryId"
-            placeholder="请输入设备编号"
+            placeholder="请选择设备"
             class="!w-1/1"
           />
         </el-form-item>
@@ -64,6 +63,7 @@
 
 <script setup lang="ts">
 import { MdWorkstationMachineApi, MdWorkstationMachineVO } from '@/api/mes/md/workstation/machine'
+import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue'
 
 defineOptions({ name: 'WorkstationMachineList' })
 
diff --git a/src/views/mes/md/workstation/WorkstationToolList.vue b/src/views/mes/md/workstation/WorkstationToolList.vue
index 6e833cfbe..66c08a605 100644
--- a/src/views/mes/md/workstation/WorkstationToolList.vue
+++ b/src/views/mes/md/workstation/WorkstationToolList.vue
@@ -36,10 +36,9 @@
         v-loading="formLoading"
       >
         <el-form-item label="工具类型" prop="toolTypeId">
-          <!-- TODO @芋艿：对接工具类型下拉列表，等 TM 工具模块完成后对接 -->
-          <el-input-number
+          <TmToolTypeSelect
             v-model="formData.toolTypeId"
-            placeholder="请输入工具类型编号"
+            placeholder="请选择工具类型"
             class="!w-1/1"
             :disabled="dialogFormType === 'update'"
           />
@@ -66,6 +65,7 @@
 
 <script setup lang="ts">
 import { MdWorkstationToolApi, MdWorkstationToolVO } from '@/api/mes/md/workstation/tool'
+import TmToolTypeSelect from '@/views/mes/tm/tool/components/TmToolTypeSelect.vue'
 
 defineOptions({ name: 'WorkstationToolList' })