Merge branch 'master' of https://git.evo-techina.com/sgc/mes-vue

src/api/orderItem.ts

@@ -130,7 +130,6 @@ export const orderItemApi = {
   },
     //根据生产编号查询预生产订单
   preCreationInfo(id: number, params:any) {
-    debugger;
     return request({ url: `/biz/orderItem/preCreation/${id}`, method: 'get', params})
   },
 
@@ -147,7 +146,10 @@ export const orderItemApi = {
   holdTemporarilySave(id: number, data: KingdeePrdMo[]){
     return request({ url: `/biz/orderItem/kingdee/temporarily/save/${id}`, method: 'post', data })
   },
-  
+  // 同步订单和计划表
+  synchronizationSave(id: number, data: KingdeePrdMo[]) {
+    return request({ url: `/biz/orderItem/kingdee/order/create/${id}`, method: 'post', data })
+  },
   // 导出
   export(params?: {
     ids?: string[]

src/views/biz/kingdee/index.vue

@@ -59,7 +59,7 @@ import { useRouter } from 'vue-router'
 import { CalendarOutline } from '@vicons/ionicons5'
 
 
-const emit = defineEmits(['holdTemporarilyCallback', "synchronizationCallback","reCrawlCallback"])
+const emit = defineEmits(['close-modal','holdTemporarilyCallback', "synchronizationCallback","reCrawlCallback"])
 const dialog = useDialog()
 const message = useMessage()
 const router = useRouter()
@@ -310,8 +310,12 @@ async function handleSyncOrderAndPlan() {
       return { ...rest, children: processRoutes } as KingdeePrdMo
     })
     
-    emit('synchronizationCallback', props.selectedId, draftData)
-    message.success('同步订单计划成功')
+    emit('synchronizationCallback', props.selectedId, draftData, (res) => {
+        if("success" === res){
+          message.success('同步订单计划成功')
+          emit('close-modal')
+        }
+      })
     kingdeeModalVisible.value = false
   } catch (error) {
     // 错误拦截器已处理

src/views/biz/orderItem/index.vue

@@ -823,11 +823,29 @@ async function holdTemporarilySave(id: number, data: KingdeePrdMo[]) {
   } 
 }
 
+// const synchronizationSave = async (id: number, data: KingdeePrdMo[], callback:Function) => {
+//   try {
+//     await orderItemApi.synchronizationSave(id, data)  .then((rps:any) =>{
+      
+//     }).catch((res) => {
+//        callback(res)
+//     })
+//     // 接口拿到数据，调用子的回调，回传结果
+//   } catch (err) {
+//     callback(err)
+//   }
+// }
+
 // 同步订单和计划表
-async function synchronizationSave(id: number, data: KingdeePrdMo[]) {
+async function synchronizationSave(id: number, data: KingdeePrdMo[], callback:Function) {
   try {
     // 恢复数据结构，将 processRoutes 转换为 children
-    await orderItemApi.synchronizationSave(id, data)
+     await orderItemApi.synchronizationSave(id, data)
+     .then((rps:any) =>{
+       callback(rps)
+    }).catch((res) => {
+       callback(res)
+    })
   } catch (error) {
     // 错误拦截器已处理
   } 

src/views/biz/orderProject/index.vue

@@ -731,10 +731,15 @@ async function handleSaveDraft(id: number, data: KingdeePrdMo[]) {
 }
 
 // 同步订单和计划表
-async function handleSyncOrderAndPlan(id: number, data: KingdeePrdMo[]) {
+async function handleSyncOrderAndPlan(id: number, data: KingdeePrdMo[], callback:Function) {
   try {
     // 恢复数据结构，将 processRoutes 转换为 children
     await orderProjectApi.saveKingdeeOrderAndPlan(id, data)
+     .then((rps:any) =>{
+       callback(rps)
+    }).catch((res) => {
+       callback(res)
+    })
   } catch (error) {
     // 错误拦截器已处理
   }