From c7782801ac54ee8f8c6b29fcc623f8d67d974a24 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 19 Jan 2024 13:17:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8E=92=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/productManagement/workoder_v2.js | 26 ++ src/api/productManagement/workorder.js | 9 +- src/api/productManagement/workplan_v2.js | 32 +++ src/views/productManagement/workorder.vue | 2 +- src/views/productManagement/workorder2.vue | 290 ++++++++++++++++--- src/views/productManagement/workplan2.vue | 319 ++++++++++++++++----- 6 files changed, 563 insertions(+), 115 deletions(-) create mode 100644 src/api/productManagement/workoder_v2.js diff --git a/src/api/productManagement/workoder_v2.js b/src/api/productManagement/workoder_v2.js new file mode 100644 index 0000000..127d7ec --- /dev/null +++ b/src/api/productManagement/workoder_v2.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' +import { downFile } from '@/utils/request' + +export function getWorkoderList(query) { + // 发送get请求，获取工单列表 + return request({ + url: '/mes/pro/workorder_v2/getWorkoderList', + method: 'get', + params: query, + }) +} + +// 导出函数，下载工作计划 +export async function dowmloadWorkorder(query) { + await downFile('/mes/pro/workorder_v2/downloadWorkorder', { ...query }) +} + +// 导出函数，删除所有工作计划 +export function deleteAllWorkorder(query) { + return request({ + url: '/mes/pro/workorder_v2/deleteAll', + method: 'get', + params: query, + + }) +} diff --git a/src/api/productManagement/workorder.js b/src/api/productManagement/workorder.js index a7df256..e27ad60 100644 --- a/src/api/productManagement/workorder.js +++ b/src/api/productManagement/workorder.js @@ -1,6 +1,7 @@ import request from '@/utils/request' import { downFile } from '@/utils/request' +// 获取待处理工单列表 export function getWorkorderList_Scheduled(query) { return request({ url: '/mes/pro/workorder/getworkorderListwithschedule', @@ -9,6 +10,7 @@ export function getWorkorderList_Scheduled(query) { }) } +// 获取待处理工单列表（无调度） export function getWorkorderList_NOSchedule(query) { return request({ url: '/mes/pro/workorder/getworkorderListwithoutschedule', @@ -17,6 +19,7 @@ export function getWorkorderList_NOSchedule(query) { }) } +// 添加调度 export function addScheduling(query) { return request({ url: '/mes/pro/workorder/setschedule', @@ -25,6 +28,7 @@ export function addScheduling(query) { }) } +// 取消调度 export function CancelScheduling(id) { return request({ url: '/mes/pro/workorder/resetschedule/' + id, @@ -32,6 +36,7 @@ export function CancelScheduling(id) { }) } +// 释放生产 export function releaseProduction(id) { return request({ url: '/mes/pro/workorder/releaseProduction/' + id, @@ -39,6 +44,7 @@ export function releaseProduction(id) { }) } +// 保存调度结果 export function saveSrotResults(data) { return request({ url: '/mes/pro/workorder/sortschedule', @@ -50,10 +56,11 @@ export function saveSrotResults(data) { +// 获取甘特图列表 export function GetGanttListAPI(query) { return request({ url: '/mes/pro/workorder/GetGanttList', method: 'get', params: query, }) -} +} \ No newline at end of file diff --git a/src/api/productManagement/workplan_v2.js b/src/api/productManagement/workplan_v2.js index 3590e94..8970712 100644 --- a/src/api/productManagement/workplan_v2.js +++ b/src/api/productManagement/workplan_v2.js @@ -1,6 +1,7 @@ import request from '@/utils/request' import { downFile } from '@/utils/request' +// 导出函数，获取工作计划列表 export function getWorkplanList(query) { return request({ url: '/mes/pro/workplan_v2/list', @@ -11,6 +12,7 @@ export function getWorkplanList(query) { +// 导出函数，添加新的工作计划 export function addNewworkplan(data) { return request({ url: '/mes/pro/workplan_v2/addworkplan', @@ -20,6 +22,7 @@ export function addNewworkplan(data) { }) } +// 导出函数，删除工作计划 export function deleteworkplan(id) { return request({ url: '/mes/pro/workplan_v2/deleteitem/' + id, @@ -27,7 +30,18 @@ export function deleteworkplan(id) { }) } +// 导出函数，删除所有工作计划 +export function deleteAllWorkplan(query) { + return request({ + url: '/mes/pro/workplan_v2/deleteAll', + method: 'get', + params: query, + + }) +} + +// 导出函数，更新工作计划 export function updateworkplan(data) { return request({ url: '/mes/pro/workplan_v2/updateworkplan', @@ -36,3 +50,21 @@ export function updateworkplan(data) { contextType: 'application/json', }) } + +// 导出函数，处理周汇总 +export function handleWeekSummary(query) { + return request({ + url: '/mes/pro/workplan_v2/getWeekSummary', + method: 'get', + params: query, + }) +} + + + +// 导出 +// 导出函数，下载工作计划 +export async function dowmloadWorkplan(query) { + + await downFile('/mes/pro/workplan_v2/downloadWorkplan', { ...query }) +} \ No newline at end of file diff --git a/src/views/productManagement/workorder.vue b/src/views/productManagement/workorder.vue index ca29582..1f9e135 100644 --- a/src/views/productManagement/workorder.vue +++ b/src/views/productManagement/workorder.vue @@ -374,7 +374,7 @@ export default { }, } - + + diff --git a/src/views/productManagement/workplan2.vue b/src/views/productManagement/workplan2.vue index fcd0a88..1d5e869 100644 --- a/src/views/productManagement/workplan2.vue +++ b/src/views/productManagement/workplan2.vue @@ -14,13 +14,75 @@ - 搜索 + 搜索 新建生产计划 导入生产计划 + 导出生产计划 + 删除本周计划 + + + + + {{ weekAll.requireNum }} + + + {{ weekAll.requireHanger }} + + + {{ weekAll.turnnum }} + + + {{ weekAll.productiontime }} + + + + + + +
将文件拖到此处，或点击上传
+
+
是否更新已经存在的生产计划
+ 仅允许导入xls、xlsx格式文件。 + 下载模板 +
+ +
+ 确 定 + 取 消 +
+ + + + + + + + + + + +
+ 确 定 + 取 消 +
+ - + - + @@ -110,6 +172,7 @@ + @@ -125,10 +188,18 @@ - - - - + + + + + + + + +
@@ -136,61 +207,27 @@ 取 消
- - - - - - - - - - - - - - - - - - - -
将文件拖到此处，或点击上传
-
-
是否更新已经存在的用户数据
- 仅允许导入xls、xlsx格式文件。 - 下载模板 -
- -
- 确 定 - 取 消 -
-