diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts
index 00f348d3e..0ccc0f3ee 100644
--- a/src/api/mes/orderDay/index.ts
+++ b/src/api/mes/orderDay/index.ts
@@ -99,9 +99,9 @@ export const getPlanDevices = async (params)  => {
 
 ///发布计划
 export const publishPlan = async (data: OrderDayVO)  => {
-  return await request.post({ url: `/mes/orderday/publishPlan`,data })
+  return await request.postOriginal({ url: `/mes/orderday/publishPlan`,data })
 }
 //终止计划
-export const stopPlan = async (params)  => {
-  return await request.post({ url: `/mes/orderday/stopPlan`,params })
+export const stopPlan = async (id)  => {
+  return await request.post({ url: `/mes/orderday/stopPlan/`+id })
 }
\ No newline at end of file
diff --git a/src/api/mes/workScheduling/index.ts b/src/api/mes/workScheduling/index.ts
index 08591d25b..d17a72c52 100644
--- a/src/api/mes/workScheduling/index.ts
+++ b/src/api/mes/workScheduling/index.ts
@@ -9,38 +9,42 @@ export const getWorkSchedulingPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/mes/work-scheduling/senior', data })
+    return await request.post({ url: '/mes/workScheduling/senior', data })
   } else {
-    return await request.get({ url: `/mes/work-scheduling/page`, params })
+    return await request.get({ url: `/mes/workScheduling/page`, params })
   }
 }
 
 // 查询生产任务排产详情
 export const getWorkScheduling = async (id: number) => {
-  return await request.get({ url: `/mes/work-scheduling/get?id=` + id })
+  return await request.get({ url: `/mes/workScheduling/get?id=` + id })
 }
 
 // 新增生产任务排产
 export const createWorkScheduling = async (data: WorkSchedulingVO) => {
-  return await request.post({ url: `/mes/work-scheduling/create`, data })
+  return await request.post({ url: `/mes/workScheduling/create`, data })
 }
 
 // 修改生产任务排产
 export const updateWorkScheduling = async (data: WorkSchedulingVO) => {
-  return await request.put({ url: `/mes/work-scheduling/update`, data })
+  return await request.put({ url: `/mes/workScheduling/update`, data })
+}
+// 更改生产任务状态
+export const updateWorkSchedulingStatus = async (data: any) => {
+  return await request.put({ url: `/mes/workScheduling/updateStatus`, data })
 }
 
 // 删除生产任务排产
 export const deleteWorkScheduling = async (id: number) => {
-  return await request.delete({ url: `/mes/work-scheduling/delete?id=` + id })
+  return await request.delete({ url: `/mes/workScheduling/delete?id=` + id })
 }
 
 // 导出生产任务排产 Excel
 export const exportWorkScheduling = async (params) => {
-  return await request.download({ url: `/mes/work-scheduling/export-excel`, params })
+  return await request.download({ url: `/mes/workScheduling/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/mes/work-scheduling/get-import-template' })
+  return request.download({ url: '/mes/workScheduling/get-import-template' })
 }
\ No newline at end of file
diff --git a/src/views/mes/orderDay/components/BasicFormV2.vue b/src/views/mes/orderDay/components/BasicFormV2.vue
index a155e9cdc..6c9c1b02c 100644
--- a/src/views/mes/orderDay/components/BasicFormV2.vue
+++ b/src/views/mes/orderDay/components/BasicFormV2.vue
@@ -4,11 +4,11 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
+    :vLoading="formLoading"
   >
   <div style="max-height: 60vh;overflow-y: auto;">
     <Form
-      ref="formRef"
-      v-loading="formLoading"
+      ref="formRef" 
       :rules="rules"
       :schema="formSchema"
       :is-col="true"
@@ -304,7 +304,9 @@ if (props.isShowFooterButtton) {
 const buttonBaseClick = (val) => {
   // 保存
   if (val == 'save') {
+    
     submitForm()
+    
   }
   // 关闭
   else if (val == 'close') {
diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 7ca6b31d2..cc2d11429 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -4,6 +4,7 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
+    :vLoading="formLoading"
   >
     <ContentWrap>
       <Descriptions
@@ -178,7 +179,7 @@
       </el-dialog>
     </ContentWrap>
     <template #footer>
-      <el-button @click="publishPlan">发布计划</el-button>
+      <el-button @click="publishPlan" >发布计划</el-button>
     </template>
     <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess" />
   </Dialog>
@@ -211,11 +212,11 @@ const graph = ref<Graph>()
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const activeName = ref('process')
-const loading = ref(true)
+const formLoading = ref(false)
 const dialogFormVisibleUser = ref(false)
 const processData = ref([])
 const processCode = ref('')
-
+//const isPublish=ref(false)
 const queryParams:orderDayconfigApi.OrderDayQueryParamVo=ref()
 const props = defineProps({
   // 查询弹窗是否显示筛选按钮
@@ -411,7 +412,26 @@ const opensearchTable = (
     true
   )
 }
-const publishPlan= async ()=>{
+const publishPlan=()=>{
+     message.confirm("确认发布当前计划？","question").then(async () => {
+      //isPublish.value=true
+      //loading.value = true,
+      try{formLoading.value=true
+      doPublishPlan() }finally{
+        formLoading.value=false;
+      }
+     // loading.value = false,
+      dialogVisible.value = false,
+      //isPublish.value=false,
+      emit('close')
+     }).catch(() => {
+      message.info("已取消发布")
+     })
+     
+    
+}
+const doPublishPlan=  ()=>{
+  
   let data ={
   updateId: detailData.value.id,
   status: detailData.value.status,
@@ -432,8 +452,14 @@ const publishPlan= async ()=>{
   endTime: detailData.value.endTime,
   taskMode: detailData.value.taskMode
 }
-  console.log("-------",data)
-  await OrderDayApi.publishPlan(data)
+  //console.log("-------",data)
+  let res = OrderDayApi.publishPlan(data)
+  if(res.code==0){
+    message.success("计划发布成功")
+  }else {
+    message.error(res.msg)
+  }
+
 }
 // 弹层确定返回所选数据
 const searchTableSuccess = (formField, searchField, val, type, row) => {
@@ -623,6 +649,10 @@ const getTeamList = async (params:any) => {
 
 defineOptions({ name: 'SechledDetail' })
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+// 传递给父类
+const emit = defineEmits([
+  'close'
+])
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index a241bf85b..a4b55b138 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -57,11 +57,12 @@
     :isBusiness="false"
     :isSearchFilterButtonHide="true"
     @onChange="valueChange"
+   
   />
 
   <!-- 详情 -->
   <orderDetail ref="detailRef" :all-schemas="OrderDay.allSchemas" />
-  <scheduleDetail ref="scheduleDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75"/>
+  <scheduleDetail ref="scheduleDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75" @close="publishClosed" />
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
@@ -81,8 +82,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import orderDetail from './components/orderDetail.vue'
 import scheduleDetail from './components/schedule.vue'
-import { Loading } from 'node_modules/element-plus/es/components/loading/src/service'
-import { loadavg } from 'os'
+
 defineOptions({ name: 'MesOrderDay' })
 
 const message = useMessage() // 消息弹窗
@@ -195,6 +195,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+const publishClosed=()=>{
+    //console.log('publishClosed')
+    getList()
+}
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
   //console.log('row',row)
@@ -206,6 +210,7 @@ const isShowMainButton = (row,val) => {
 }
 // 列表-操作按钮
 // 列表-操作按钮
+//TERMINALE("4", "已终止"),PROCESSING("3", "生产中"),PUBLISHED("2", "待开工"),WAITSECHUDLE("1", "待排产"),CANCELED("-2", "已取消"),WAITREADY("-1", "待齐套");
 const butttondata = (row) => {
      //console.log('row2',row)
     return [
@@ -227,11 +232,11 @@ const butttondata = (row) => {
     //   hasPermi: ''}), // 路由设置
       defaultButtons.mainListHandleBtn({label: '终止',
       name: 'stopPlan',
-      hide: isShowMainButton(row,['1','2','3']),
+      hide: isShowMainButton(row,['-1','1','2','3']),
       type: 'warning',
       icon: '',
       color: '',
-      hasPermi: ''}), // 路由设置
+      hasPermi: 'mes:orderDay:update'}), // 路由设置
     ]
 }
 
@@ -244,6 +249,8 @@ const buttonTableClick = async (val, row) => {
     handleDelete(row.id)
   } else if(val=='publish'){  //发布计划
     openScheduledDetail( '发布计划', row,row.planNoDay)
+  }else if(val=='stopPlan'){  //终止计划
+    stopPlan(row.id)
   }
 }
 
@@ -255,25 +262,23 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-
-  var isHave =OrderDay.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
   
   if (formType === 'create') {
-    await OrderDayApi.createOrderDay(data)
-    message.success(t('common.createSuccess'))
+    let ret=await OrderDayApi.createOrderDay(data)
+    if(ret===undefined || ret===null){
+      message.error(t('common.networkError'))
+    }else{
+      message.success(t('common.createSuccess'))
+    }
+   
   } else {
-    await OrderDayApi.updateOrderDay(data)
-    message.success(t('common.updateSuccess'))
+    let ret=await OrderDayApi.updateOrderDay(data)
+    if(ret.code==0){
+      message.success(t('common.updateSuccess'))
+    }else{
+      message.error(t('common.networkError'))
+    }
+    
   }
   
   basicFormRef.value.dialogVisible = false
@@ -318,7 +323,10 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
-
+const stopPlan = async (id) => {
+   await OrderDayApi.stopPlan(id)
+   getList()
+}
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {
diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts
index a67084f4d..23b0177c5 100644
--- a/src/views/mes/orderDay/orderDay.data.ts
+++ b/src/views/mes/orderDay/orderDay.data.ts
@@ -263,7 +263,9 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'planDate',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
+    isForm:false,
+    isTable:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -286,11 +288,12 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     required: true,
     form: {
-      component: 'TimePicker',
+      component: 'DatePicker',
       componentProps: {
-        type: 'time',
-        dateFormat: 'HH:mm',
-        //valueFormat: 'x',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        timeFormat:"HH:mm"
       }
     },
   },
@@ -301,10 +304,12 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     isReadonly:true,
     form: {
-      component: 'TimePicker',
+      component: 'DatePicker',
       componentProps: {
-        type: 'time',
-        dateFormat: 'HH:mm',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        timeFormat:"HH:mm"
       }
     },
   },
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index d41e3d2bc..59b9e7fe0 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -27,13 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #planMaserCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.planMaserCode)">
+      <template #schedulingCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
           <span>{{ row.planMaserCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -81,6 +81,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from './components/Detail.vue'
+import { async } from '@antv/x6/lib/registry/marker/async'
 
 defineOptions({ name: 'MesWorkScheduling' })
 
@@ -100,7 +101,15 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     formRef.setValues(setV)
   })
 }
-
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  //console.log('row',row)
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -115,9 +124,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:workScheduling:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:workScheduling:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:workScheduling:export'}), // 导出
+  //defaultButtons.defaultAddBtn({hasPermi:'mes:workScheduling:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:workScheduling:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:workScheduling:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -146,19 +155,36 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
+// ONERROR("-3", "异常"),
+//     TERMINALE("-2", "已终止"),
+//     WAITBEGIN("-1", "待齐套"),
+//     READYTODO("0", "待开工"),
+//     WORKING("1", "生产中"),
+//     WAITMATERIAL("2", "待配料"),
+//     PAUSE("3", "已暂停"),
+//     WAITREPORT("4", "待报工"),
+//     WAITFCHECK("5", "待质检"),
+//     FINISHED("9", "已完成");
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:workScheduling:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:workScheduling:delete'}), // 删除
-]
+const butttondata=(row) =>{ return [
+  defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除
+  defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), // 
+  defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), 
+  defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}), 
+  //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), // 
+]}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+  } else if (val == 'terminate') { // 终止
+    changeBillStatus(row,"-2")
+  }else if (val == 'pause') { // 暂停
+    changeBillStatus(row,"3")
+  }else if (val == 'resume') { // 恢复
+    changeBillStatus(row,"0")
   }
 }
 
@@ -197,18 +223,15 @@ const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkScheduling')
 }
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await WorkSchedulingApi.deleteWorkScheduling(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
+//  改变工单状态
+const changeBillStatus=async(row,status)=>{
+    ///message.alertWarning("暂不支持该功能")
+    let data={
+      id:row.id,
+      status:status
+    }
+     WorkSchedulingApi.updateWorkSchedulingStatus(data);
+     getList()
 }
 
 /** 导出按钮操作 */
diff --git a/src/views/mes/workScheduling/workScheduling.data.ts b/src/views/mes/workScheduling/workScheduling.data.ts
index 3201a4e1f..81b8a9224 100644
--- a/src/views/mes/workScheduling/workScheduling.data.ts
+++ b/src/views/mes/workScheduling/workScheduling.data.ts
@@ -41,17 +41,16 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
   },
   {
     label: '计划编号',
     field: 'planMaserCode',
     sort: 'custom',
     isSearch: true,
-    isForm: false,
+    isForm: true,
   },
   {
-    label: '任务编号',
+    label: '工单编号',
     field: 'schedulingCode',
     sort: 'custom',
     isSearch: true,
@@ -89,7 +88,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划数量',
     field: 'planCount',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
   },
   {
     label: '完工数量',
@@ -114,6 +113,12 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'flagDo',
     sort: 'custom',
     isSearch: true,
+    isForm:false,
+    dictType: DICT_TYPE.MESDO_STATUS,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    },
   },
   {
     label: '当前工序',
@@ -122,23 +127,30 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '当前任务号',
-    field: 'workingTaskSort',
+    label: '加工序号',
+    field: 'workSort',
     sort: 'custom',
     isForm: false,
   },
   {
-    label: '工单模式',
-    field: 'formType',
+    label: '当前任务号',
+    field: 'workingTaskSort',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
   },
+  
   {
-    label: '生产序号',
-    field: 'workSort',
+    label: '工单模式',
+    field: 'formType',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
+    dictType: DICT_TYPE.MES_WORKBILL_MODEL,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    },
   },
+  
   {
     label: '操作',
     field: 'action',