diff --git a/api/workorder/proreportwork.js b/api/workorder/proreportwork.js new file mode 100644 index 0000000..b7af5ce --- /dev/null +++ b/api/workorder/proreportwork.js @@ -0,0 +1,79 @@ +import request from '@/utils/request' + + +/** + * 获取报工工单列表 + * @param {Id} + */ +export function getReportWorkOrderList(quary) { + return request({ + url: '/mes/productManagement/ProReportwork/list', + method: 'post', + data:quary + }) +} +/** + * 如果没有报工记录，先生成报工记录 + * @param {Id} + */ +export function manualGenerationOfReportWork(quary) { + return request({ + url: '/mes/productManagement/ProReportwork/manual_generation_reportwork', + method: 'get', + params:quary + }) +} + +/** + * 修改报工表(完成报工) + * @param data + */ +export function updateProReportwork(data) { + return request({ + url: '/mes/productManagement/ProReportwork', + method: 'PUT', + data: data + }) +} + +/** + * 获取报工表详情 + * @param {Id} + */ +export function getProReportwork(id) { + return request({ + url: '/mes/productManagement/ProReportwork/' + id, + method: 'get' + }) +} + +/** + * 获取工单进度 + * @param {主键} pid + */ +export function getWorkOrderProgress(query) { + return request({ + url: '/kanban/workorderProgress/get_workorder_progress', + method: 'get', + params: query + }) +} + + + + +/** + * 放错扫码报工（扫标签码） + * @param {主键} pid + * -1 此产品不属于此工单 0 报工失败 1 成功报工 + */ +export function errorProofingAndReportingWork(query) { + return request({ + url: '/kanban/workorderProgress/errorProofingAndReportingWork', + method: 'get', + params: query + }) +} + + + diff --git a/api/workorder/proworkorder.js b/api/workorder/proworkorder.js new file mode 100644 index 0000000..4421489 --- /dev/null +++ b/api/workorder/proworkorder.js @@ -0,0 +1,106 @@ +import request from '@/utils/request' + +/** + * 生产工单分页查询 + * @param {查询条件} data + */ +export function listProWorkorder(data) { + return request({ + url: '/mes/productManagement/ProWorkorder/list', + method: 'post', + data: data + }) +} + +/** + * 生产工单（不校验）分页查询 + * @param {查询条件} data + */ +export function listProWorkorderNoCheck(data) { + return request({ + url: '/mes/productManagement/ProWorkorder/list_nocheck', + method: 'post', + data: data + }) +} + +/** + * 获取生产工单详情 + * @param {Id} + */ +export function getProWorkorder(id) { + return request({ + url: '/mes/productManagement/ProWorkorder/' + id, + method: 'get' + }) +} + +/** + * 获取全部工艺路线 + * @param {查询条件} params + */ +export function GetAllRoute() { + return request({ + url: '/mes/productManagement/ProWorkorder/get_all_route', + method: 'get' + }) +} + +/** + * 获取全部组 + * @param {查询条件} params + */ +export function GetAllGroup() { + return request({ + url: '/mes/productManagement/ProWorkorder/get_groups', + method: 'get' + }) +} + +/** + * 工单进度跟踪 + * @param {查询条件} params + */ +export function GetWorkorderTraceProgressList(data) { + return request({ + url: '/mes/productManagement/ProWorkorder/get_workorder_trace_progress', + method: 'post', + data + }) +} + +/** + * 获取工单详情 + * @param {查询条件} params + */ +export function GetWorkOrderDetail(params) { + return request({ + url: '/kanban/workorderProgress/get_workorder_detail', + method: 'get', + params + }) +} + +/** + * 开始工单 + * @param {主键} pid + */ +export function startWorkOrder(query) { + return request({ + url: '/kanban/workorderProgress/start_workorder', + method: 'get', + params: query + }) +} + +/** + * 完成工单 + * @param {主键} pid + */ +export function finishWorkOrder(query) { + return request({ + url: '/kanban/workorderProgress/finish_workorder2', + method: 'get', + params: query + }) +} diff --git a/pages.json b/pages.json index f5a2f24..c928f68 100644 --- a/pages.json +++ b/pages.json @@ -119,6 +119,27 @@ "style": { "navigationBarTitleText": "备料任务详情" } + }, + { + "path" : "pages/produceManagement/workorder/workorder", + "style" : + { + "navigationBarTitleText" : "工单列表" + } + }, + { + "path" : "pages/produceManagement/reportWorkOrder/reportWorkOrder", + "style" : + { + "navigationBarTitleText" : "工单报工" + } + }, + { + "path" : "pages/produceManagement/scanWorkOrder/scanWorkOrder", + "style" : + { + "navigationBarTitleText" : "扫码报工" + } } ], "tabBar": { diff --git a/pages/index.vue b/pages/index.vue index 55e14f7..d0932ac 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -12,9 +12,20 @@ + + + + + + + {{ item.name }} + + + + - + @@ -44,6 +55,14 @@ export default { image: '/static/images/door/3.jpg' } ], + // 生产模块 + produceOptions: [ + { + name: '产线报工', + icon: 'folder-add-filled', + url: '/pages/produceManagement/workorder/workorder' + } + ], // 物料模块 materialOptions: [ { @@ -51,11 +70,11 @@ export default { icon: 'upload-filled', url: '/pages/materialManagement/preparationByPlan/index' }, - { - name: '工单备料', - icon: 'upload-filled', - url: '/pages/materialManagement/materialPreparation/index' - } + // { + // name: '工单备料', + // icon: 'upload-filled', + // url: '/pages/materialManagement/materialPreparation/index' + // } ] }; }, @@ -66,7 +85,18 @@ export default { changeSwiper(e) { this.current = e.detail.current; }, - changeGrid(e) { + // 产线功能 + changeProduceGrid(e) { + const _url = this.produceOptions[e.detail.index].url; + uni.navigateTo({ + url: _url, + fail: () => { + this.$modal.showToast('模块建设中~'); + } + }); + }, + // 物料功能 + changeMaterialGrid(e) { const _url = this.materialOptions[e.detail.index].url; uni.navigateTo({ url: _url, diff --git a/pages/produceManagement/reportWorkOrder/reportWorkOrder.vue b/pages/produceManagement/reportWorkOrder/reportWorkOrder.vue new file mode 100644 index 0000000..235ef8b --- /dev/null +++ b/pages/produceManagement/reportWorkOrder/reportWorkOrder.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue b/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue new file mode 100644 index 0000000..8d12c51 --- /dev/null +++ b/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/pages/produceManagement/workorder/workorder.vue b/pages/produceManagement/workorder/workorder.vue new file mode 100644 index 0000000..2c14d32 --- /dev/null +++ b/pages/produceManagement/workorder/workorder.vue @@ -0,0 +1,200 @@ + + + + +