diff --git a/src/components/TableSelectDialog/TableSelectDialog.vue b/src/components/TableSelectDialog/TableSelectDialog.vue
index 4e278809..1866a348 100644
--- a/src/components/TableSelectDialog/TableSelectDialog.vue
+++ b/src/components/TableSelectDialog/TableSelectDialog.vue
@@ -9,6 +9,7 @@
         :show-overflow-tooltip="true"
         :stripe="true"
         @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
       >
         <el-table-column type="selection" width="55" reserve-selection />
         <el-table-column
@@ -53,11 +54,13 @@ const props = withDefaults(
     title: string
     columns: TableColumn[]
     fetchApi: (params: Record<string, any>) => Promise<{ list: any[]; total: number }>
+    selectionType?: 'single' | 'multiple'
     rowKey?: string
     pageSize?: number
     initialRows?: any[]
   }>(),
   {
+    selectionType: 'multiple',
     rowKey: 'id',
     pageSize: 10,
     initialRows: () => []
@@ -79,6 +82,7 @@ const queryParams = reactive({
 })
 const selectedMap = ref(new Map<number | string, any>())
 const syncingSelection = ref(false)
+const isSingleSelect = computed(() => props.selectionType === 'single')
 
 const resolveRowKey = (row: Record<string, any>) => row[props.rowKey]
 
@@ -115,6 +119,15 @@ const getList = async () => {
 
 const handleSelectionChange = (rows: any[]) => {
   if (syncingSelection.value) return
+  if (isSingleSelect.value) {
+    selectedMap.value.clear()
+    const latestRow = rows.length ? rows[rows.length - 1] : undefined
+    if (latestRow) {
+      selectedMap.value.set(resolveRowKey(latestRow), latestRow)
+    }
+    void refreshSelectionOnTable()
+    return
+  }
   const pageIdSet = new Set(list.value.map((item) => resolveRowKey(item)))
   pageIdSet.forEach((id) => {
     selectedMap.value.delete(id)
@@ -124,9 +137,26 @@ const handleSelectionChange = (rows: any[]) => {
   })
 }
 
+const handleRowClick = (row: any) => {
+  if (!isSingleSelect.value) return
+  const table = tableRef.value
+  if (!table) return
+  syncingSelection.value = true
+  try {
+    table.clearSelection()
+    table.toggleRowSelection(row, true)
+  } finally {
+    syncingSelection.value = false
+  }
+  selectedMap.value.clear()
+  selectedMap.value.set(resolveRowKey(row), row)
+}
+
 const open = async (rows?: any[]) => {
   selectedMap.value.clear()
-  ;(rows || props.initialRows).forEach((row) => {
+  const initialRows = rows || props.initialRows
+  const nextRows = isSingleSelect.value ? initialRows.slice(0, 1) : initialRows
+  nextRows.forEach((row) => {
     selectedMap.value.set(resolveRowKey(row), row)
   })
   queryParams.pageNo = 1
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 2a82872d..c3a7c925 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3484,6 +3484,7 @@ export default {
 
       tableCodeColumn: 'Plan Code',
       tableProductColumn: 'Product',
+      tableDeviceNameColumn: 'Device Name',
       tableFeedingPipelineColumn: 'Production Line',
       tablePlanNumberColumn: 'Planned Qty',
       tableFinishNumberColumn: 'Finished Qty',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 622deb0f..4fe62873 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3321,6 +3321,7 @@ export default {
 
       tableCodeColumn: '计划编码',
       tableProductColumn: '产品',
+      tableDeviceNameColumn: '设备名称',
       tableFeedingPipelineColumn: '生产线',
       tablePlanNumberColumn: '计划数量',
       tableFinishNumberColumn: '完工数量',
diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index 4566e8b5..1e44dbb4 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="110px"
       v-loading="formLoading"
     >
     <el-form-item :label="t('ProductionPlan.Plan.dialogTaskLabel')" prop="taskId">
@@ -68,30 +68,8 @@
     </el-col>
   </el-row>
 </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.dialogFeedingPipelineLabel')" prop="feedingPipeline">
-        <el-tree-select
-                  v-model="formData.feedingPipeline"
-                  :data="organizationTree"
-                  :props="defaultProps"
-                  check-strictly
-                  default-expand-all
-                  :placeholder="t('ProductionPlan.Plan.dialogFeedingPipelinePlaceholder')"
-                />
-      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.dialogWorkerLabel')" prop="workerId">
-        <el-select
-          v-model="formData.workerId"
-          clearable
-          filterable
-          :placeholder="t('ProductionPlan.Plan.dialogWorkerPlaceholder')"
-        >
-          <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
+      <el-form-item label="交货日期">
+        <el-input :model-value="deliveryDateText" disabled />
       </el-form-item>
 <!--      <el-form-item label="产品" prop="productId">-->
 <!--        <el-select-->
@@ -110,6 +88,14 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
+      <el-form-item label="设备" prop="feedingPipeline">
+        <el-input
+          :model-value="deviceDisplayText"
+          placeholder="点击选择设备"
+          readonly
+          @click="openDeviceSelectDialog"
+        />
+      </el-form-item>
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanNumberLabel')" prop="planNumber">
         <el-input v-model="formData.planNumber"  />
       </el-form-item>
@@ -145,6 +131,16 @@
           class="!w-full"
         />
       </el-form-item>
+      <el-form-item label="最晚开工时间" prop="latestStartTime">
+        <el-date-picker
+          v-model="formData.latestStartTime"
+          type="date"
+          value-format="x"
+          :disabled-date="latestStartDisabledDate"
+          placeholder="请选择最晚开工时间"
+          class="!w-full"
+        />
+      </el-form-item>
       <!-- <el-form-item label="班别" prop="groupType">
         <el-radio-group v-model="formData.groupType">
           <el-radio
@@ -165,32 +161,35 @@
       <el-button @click="dialogVisible = false">{{ t('ProductionPlan.Plan.dialogCancelButtonText') }}</el-button>
     </template>
   </Dialog>
+  <TableSelectDialog
+    ref="deviceSelectDialogRef"
+    title="选择设备"
+    :columns="deviceColumns"
+    :fetch-api="fetchDeviceLedgerPage"
+    selection-type="single"
+    row-key="id"
+    @confirm="handleDeviceSelectConfirm"
+  />
 </template>
 <script setup lang="ts">
 
+import dayjs from 'dayjs'
 import { PlanApi, PlanVO } from '@/api/mes/plan'
-import * as UserApi from "@/api/system/user";
-import { TaskApi, TaskDetailVO, TaskVO} from "@/api/mes/task";
-import { ProductVO } from "@/api/erp/product/product";
-import { defaultProps, handleTree } from '@/utils/tree';
-import { OrganizationApi } from '@/api/mes/organization';
-import {WorkTeamApi} from "@/api/mes/workteam";
-import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
-import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
+import { TaskApi, TaskDetailVO, TaskVO } from '@/api/mes/task'
+import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
+import TableSelectDialog from '@/components/TableSelectDialog/TableSelectDialog.vue'
+import { DICT_TYPE, getIntDictOptions } from "@/utils/dict";
 
 /** 生产计划 表单 */
 defineOptions({ name: 'PlanForm' })
-const userList = ref<UserApi.UserVO[]>([]) // 用户列表
-const productList = ref<ProductVO[]>([]) // 产品列表
 const taskList = ref<TaskVO[]>([]) // 用户列表
 const taskDetailList = ref<TaskDetailVO[]>([]) // 用户列表
-const organizationTree = ref() // 树形结构
+const deviceSelectDialogRef = ref()
+const selectedDeviceRows = ref<DeviceLedgerVO[]>([])
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
-const editDisable = ref(false) // 编辑状态禁用
-
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -214,10 +213,61 @@ const formData = ref({
   groupType: undefined,
   isEnable: undefined,
   feedingPipeline: undefined,
+  feedingPipelineName: undefined,
   workerId: undefined,
   isPreProduction: undefined,
-  isCode: undefined
+  isCode: undefined,
+  latestStartTime: undefined,
+  finishDate: undefined
+})
+const deliveryDateText = computed(() => {
+  if (!formData.value.finishDate) return ''
+  const value = dayjs(formData.value.finishDate)
+  if (!value.isValid()) return String(formData.value.finishDate)
+  return value.format('YYYY-MM-DD')
 })
+const deviceDisplayText = computed(() => {
+  if (selectedDeviceRows.value.length) {
+    return selectedDeviceRows.value
+      .map((item: any) => item.deviceName || item.name || item.code || `ID:${item.id}`)
+      .join('、')
+  }
+  if (formData.value.feedingPipelineName) return String(formData.value.feedingPipelineName)
+  return ''
+})
+const deviceColumns = [
+  { label: '设备编号', prop: 'deviceCode', minWidth: 140 },
+  { label: '设备名称', prop: 'deviceName', minWidth: 160 },
+  { label: '设备型号', prop: 'deviceModel', minWidth: 140 },
+  { label: '所属车间', prop: 'workshop', minWidth: 140 }
+]
+const latestStartDisabledDate = (date: Date) => {
+  if (!formData.value.finishDate) return false
+  const deliveryDate = dayjs(formData.value.finishDate)
+  if (!deliveryDate.isValid()) return false
+  return dayjs(date).startOf('day').valueOf() > deliveryDate.startOf('day').valueOf()
+}
+const validateLatestStartTime = (_rule: any, value: any, callback: (error?: Error) => void) => {
+  if (!value) {
+    callback()
+    return
+  }
+  if (!formData.value.finishDate) {
+    callback()
+    return
+  }
+  const latestStart = dayjs(value)
+  const deliveryDate = dayjs(formData.value.finishDate)
+  if (!latestStart.isValid() || !deliveryDate.isValid()) {
+    callback()
+    return
+  }
+  if (latestStart.startOf('day').valueOf() > deliveryDate.startOf('day').valueOf()) {
+    callback(new Error('最晚开工时间不能晚于交货日期'))
+    return
+  }
+  callback()
+}
 const formRules = reactive({
   taskDetailId: [{ required: true, message: t('ProductionPlan.Plan.validatorTaskDetailRequired'), trigger: 'blur' }],
   taskId: [{ required: true, message: t('ProductionPlan.Plan.validatorTaskRequired'), trigger: 'blur' }],
@@ -225,19 +275,59 @@ const formRules = reactive({
   // reyaNumber: [{ required: true, message: t('ProductionPlan.Plan.validatorReyaNumberRequired'), trigger: 'blur' }],
   planStartTime: [{ required: true, message: t('ProductionPlan.Plan.validatorPlanStartRequired'), trigger: 'blur' }],
   planEndTime: [{ required: true, message: t('ProductionPlan.Plan.validatorPlanEndRequired'), trigger: 'blur' }],
-  feedingPipeline: [{ required: true, message: t('ProductionPlan.Plan.validatorFeedingPipelineRequired'), trigger: 'blur' }],
-  workerId: [{ required: true, message: t('ProductionPlan.Plan.validatorWorkerRequired'), trigger: 'blur' }],
+  feedingPipeline: [{ required: true, message: '请选择设备', trigger: 'change' }],
   isPreProduction: [{ required: true, message: t('ProductionPlan.Plan.validatorPreProductionRequired'), trigger: 'blur' }],
+  latestStartTime: [
+    { required: true, message: '请选择最晚开工时间', trigger: 'blur' },
+    { validator: validateLatestStartTime, trigger: 'change' }
+  ]
 })
 const formRef = ref() // 表单 Ref
 
+const fetchDeviceLedgerPage = (params: Record<string, any>) => {
+  console.log('11',taskDetailList.value[0])
+  return DeviceLedgerApi.getDeviceLedgerPage({
+    ...params,
+    isScheduled: 1,
+    productId: taskDetailList.value[0].productId
+  })
+}
+
+const openDeviceSelectDialog = () => {
+  const rows = selectedDeviceRows.value.length
+    ? selectedDeviceRows.value.map((item: any) => ({ ...item, id: Number(item.id) }))
+    : formData.value.feedingPipeline
+    ? [
+        {
+          id: Number(formData.value.feedingPipeline),
+          deviceName: formData.value.feedingPipelineName
+        }
+      ]
+    : []
+  deviceSelectDialogRef.value?.open(rows)
+}
+
+const handleDeviceSelectConfirm = (payload: { ids: (number | string)[]; rows: any[] }) => {
+  const row = payload.rows?.[0]
+  if (!row) return
+  const deviceId = Number(row.id)
+  if (!Number.isFinite(deviceId)) return
+  formData.value.feedingPipeline = deviceId
+  formData.value.feedingPipelineName = row.deviceName || row.name || row.code || `设备ID:${deviceId}`
+  selectedDeviceRows.value = [row]
+}
+
+const syncFinishDateByTaskDetail = () => {
+  const detail = taskDetailList.value.find((item: any) => Number(item.id) === Number(formData.value.taskDetailId))
+  formData.value.finishDate = detail?.finishDate || detail?.deliveryDate || undefined
+}
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number,
                     taskId?: number, productId?: number, number?: number, taskDetailId?:string) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
-  editDisable.value = false
   resetForm()
   if(taskId) {
    formData.value.taskId = taskId
@@ -246,6 +336,7 @@ const open = async (type: string, id?: number,
     const taskDetails = taskDetailList.value.filter(item => item.id === taskDetailId)
     if(taskDetails && taskDetails.length > 0 && taskDetails[0].id) {
         formData.value.taskDetailId = taskDetails[0].id
+        formData.value.finishDate = (taskDetails[0] as any).finishDate || (taskDetails[0] as any).deliveryDate || undefined
     }      
   }  
   } 
@@ -255,27 +346,24 @@ const open = async (type: string, id?: number,
     formData.value.planNumber = number
     formData.value.reyaNumber = number
   }
-  if(type==='update'){
-    editDisable.value = true
-  }
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
       formData.value = await PlanApi.getPlan(id)
+      if (formData.value.feedingPipeline) {
+        selectedDeviceRows.value = [
+          {
+            id: Number(formData.value.feedingPipeline),
+            deviceName: formData.value.feedingPipelineName
+          } as DeviceLedgerVO
+        ]
+      }
     } finally {
       formLoading.value = false
     }
   }
-  // 加载用户列表
-  //userList.value = await UserApi.getSimpleUserList()
-  // 列表
-  //productList.value = await ProductApi.getMesProductSimpleList()
-  // 列表
   taskList.value = await TaskApi.getPlanTaskList()
-  // 获得制浆工人列表
-  userList.value = await WorkTeamApi.getUserList("zhijiang", '')
-  await getOrganizationTree()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -322,29 +410,26 @@ const resetForm = () => {
     remark: undefined,
     groupType: undefined,
     isEnable: undefined,
+    feedingPipeline: undefined,
+    feedingPipelineName: undefined,
     isPreProduction: 0,
-    isCode: true
+      isCode: true,
+      latestStartTime: undefined,
+      finishDate: undefined
   }
+  selectedDeviceRows.value = []
   formRef.value?.resetFields()
 }
 
 /** 任务单变化 */
-const handleTaskChange = async(e) => {
+const handleTaskChange = async() => {
   taskDetailList.value =await TaskApi.getTaskDetailListByTaskId(formData.value.taskId)
+  formData.value.taskDetailId = undefined
+  formData.value.finishDate = undefined
 }
 /** 明细变化 */
-const handleTaskDetailChange = async(e) => {
-  console.log(e)
-}
-
-/** 获得产线工位树 */
-const getOrganizationTree = async () => {
-  organizationTree.value = []
-  const req = {orgClass:'pipeline'}
-  const data = await OrganizationApi.getOrganizationList(req)
-  const root: Tree = { id: 0, name: '顶级组织', children: [] }
-  root.children = handleTree(data, 'id', 'parentId')
-  organizationTree.value.push(root)
+const handleTaskDetailChange = async() => {
+  syncFinishDateByTaskDetail()
 }
 </script>
 
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index f99029a0..b637a685 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -165,7 +165,7 @@
       <el-table-column :label="t('ProductionPlan.Plan.tableCodeColumn')" align="center" prop="code" min-width="180px" sortable/>
       <el-table-column :label="t('ProductionPlan.Plan.tableProductColumn')" align="center" prop="productName" min-width="200px" sortable/>
 <!--      <el-table-column label="任务单" align="center" prop="taskCode" min-width="150px"  sortable />-->
-      <el-table-column :label="t('ProductionPlan.Plan.tableFeedingPipelineColumn')" align="center" prop="feedingPipelineName" sortable /> 
+      <el-table-column :label="t('ProductionPlan.Plan.tableDeviceNameColumn')" align="center" prop="deviceName" sortable />
       <el-table-column :label="t('ProductionPlan.Plan.tablePlanNumberColumn')" align="center" prop="planNumber" sortable/>
       <el-table-column :label="t('ProductionPlan.Plan.tableFinishNumberColumn')" align="center" prop="wangongNumber" sortable/>
       <el-table-column :label="t('ProductionPlan.Plan.tablePassRateColumn')" align="center" prop="passRate" sortable/>
diff --git a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
index 320bdaa8..2f69e8db 100644
--- a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
+++ b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
@@ -483,7 +483,6 @@ const handleSubmit = async () => {
         isCode: true,
         planStartTime: new Date().getTime(),
         planEndTime: new Date().getTime(),
-        reyaNumber: planNumber,
         productCode: row.barCode,
 
         // Image fields
diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue
index a1977b03..19927971 100644
--- a/src/views/mes/tasksummary/index.vue
+++ b/src/views/mes/tasksummary/index.vue
@@ -74,7 +74,7 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" hi
         :formatter="dateFormatter2" sortable />
       <el-table-column
 :label="t('ProductionPlan.TaskSummary.tableDeliveryDateColumn')" align="center"
-        prop="deliveryDate" :formatter="dateFormatter2" sortable />
+        prop="deliveryDate" :formatter="deliveryDateFormatter" sortable />
       <el-table-column :label="t('ProductionPlan.TaskSummary.tableStatusColumn')" align="center" prop="status" sortable>
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_TASK_STATUS" :value="scope.row.status" />
@@ -158,6 +158,10 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const { push } = useRouter()
 const taskScheduleDialogRef = ref()
+const deliveryDateFormatter = (_row: any, _column: any, value: any) => {
+  if (value) return dateFormatter2(_row, _column, value)
+  return dateFormatter2(_row, _column, _row?.finishDate)
+}
 /** 查询列表 */
 const getList = async () => {
   loading.value = true