diff --git a/src/api/base/coreWorkOrder.js b/src/api/base/coreWorkOrder.js index ba6b362c..0ee2495b 100644 --- a/src/api/base/coreWorkOrder.js +++ b/src/api/base/coreWorkOrder.js @@ -1,8 +1,8 @@ /* * @Author: Do not edit * @Date: 2023-10-21 11:50:46 - * @LastEditTime: 2023-11-15 17:19:19 - * @LastEditors: DY + * @LastEditTime: 2024-12-27 15:20:14 + * @LastEditors: zwq * @Description: */ import request from '@/utils/request' @@ -161,3 +161,20 @@ export function createConCoreWOr(data) { data: data }) } + +// 更新分配产量 +export function updateBatch(data) { + return request({ + url: '/base/core-order-con-work-order/updateBatch', + method: 'put', + data: data + }) +} +// 更新订单表与工单关联表 多对多 +export function updateConCoreWOr(data) { + return request({ + url: '/base/core-order-con-work-order/update', + method: 'put', + data: data + }) +} diff --git a/src/api/base/groupSchedulingRule.js b/src/api/base/groupSchedulingRule.js index d93d02fc..9beec6cf 100644 --- a/src/api/base/groupSchedulingRule.js +++ b/src/api/base/groupSchedulingRule.js @@ -8,7 +8,13 @@ export function createGroupRule(data) { data: data }) } - +// 作废排班规则 +export function disableGroupRule(id) { + return request({ + url: '/base/group-scheduling-rule/disable?id=' + id, + method: 'post', + }) +} // 更新排班规则基础信息 export function updateGroupRule(data) { return request({ diff --git a/src/api/base/product.js b/src/api/base/product.js index 2924c882..af1ae833 100644 --- a/src/api/base/product.js +++ b/src/api/base/product.js @@ -1,8 +1,16 @@ import request from '@/utils/request' -// 获得产品列表 +// 获得物料列表(包括产品) export function getProductAll() { return request({ url: '/base/core-product-material/listAll', method: 'get' }) } +// 获得产品列表 +export function getProductList() { + return request({ + url: '/base/core-product-material/listAllProduct', + method: 'get' + }) +} + diff --git a/src/api/equipment/base/maintain/items.js b/src/api/equipment/base/maintain/items.js index e4cd33b8..d9a92739 100644 --- a/src/api/equipment/base/maintain/items.js +++ b/src/api/equipment/base/maintain/items.js @@ -23,6 +23,13 @@ export function getItemPageData(data) { }) } +export function getByEquId(id) { + return request({ + url: '/base/equipment-maintain-program/getByEquId?id=' + id, + method: 'get', + }) +} + export function getItemData(id) { return request({ url: 'base/equipment-maintain-program/get?id=' + id, diff --git a/src/views/delivery/deliveryLog/components/addOrUpdate.vue b/src/views/delivery/deliveryLog/components/addOrUpdate.vue index 15c43943..1026062f 100644 --- a/src/views/delivery/deliveryLog/components/addOrUpdate.vue +++ b/src/views/delivery/deliveryLog/components/addOrUpdate.vue @@ -38,15 +38,8 @@ - - - - - + + @@ -75,7 +68,6 @@ + diff --git a/src/views/produce/order/base/orderManage/components/orderAdd.vue b/src/views/produce/order/base/orderManage/components/orderAdd.vue index 8f0174c6..9c0dce6f 100644 --- a/src/views/produce/order/base/orderManage/components/orderAdd.vue +++ b/src/views/produce/order/base/orderManage/components/orderAdd.vue @@ -19,6 +19,12 @@ + + + + + @@ -79,7 +85,7 @@ + diff --git a/src/views/produce/workOrder/allocation.vue b/src/views/produce/workOrder/allocation.vue index 9fc2dd85..3b48fca6 100644 --- a/src/views/produce/workOrder/allocation.vue +++ b/src/views/produce/workOrder/allocation.vue @@ -16,98 +16,58 @@ {{ '分配产量' }}
-
+
- 工单名称:{{ dataForm.name }} - 工单编码:{{ dataForm.code }} + 工单名称:{{ dataForm.name }} + 工单编码:{{ dataForm.code }} - 产品名称:{{ dataForm.productName }} - 产品规格:{{ dataForm.specifications }} + 产品名称:{{ dataForm.productName }} + 产品规格:{{ dataForm.specifications }} - 实际生产数量:{{ dataForm.expectedTime }} + 实际生产数量:{{ dataForm.actualQuantity }}
- - + - - + + - - - -
- - diff --git a/src/views/produce/workOrder/index.vue b/src/views/produce/workOrder/index.vue index d4669390..b4f72ee3 100644 --- a/src/views/produce/workOrder/index.vue +++ b/src/views/produce/workOrder/index.vue @@ -130,17 +130,7 @@ export default { { name: 'status', type: 'equal', - value: 2 - }, - { - name: 'status', - type: 'equal', - value: 3 - }, - { - name: 'status', - type: 'equal', - value: 4 + value: 1 } ] } @@ -315,7 +305,14 @@ export default { { prop: 'status', label: '工单状态', - filter: (val) => ['', '等待', '激活', '暂停', '完成', '', '', '', '', '作废'][val] + filter: (val) => ['', '等待', '激活', '暂停', '完成', '作废', '终止', '', '', ''][val] + }, + { + prop: 'startProduceTime', + label: '实际开始时间', + filter: parseTime, + minWidth: 150, + showOverflowtooltip: true }, { prop: 'planFinishTime', @@ -362,20 +359,20 @@ export default { }) }, refreshWorkOrder(val) { - console.log(val) - if (val) { - // 预使用原料信息 - console.log('预使用原料信息') - this.handleCancel() - this.getDataList() - this.materialVisible = true; - this.addOrEditTitle = "预使用主原料信息"; - this.$nextTick(() => { - this.$refs.material.init(val, true); - }); - } else { - this.successSubmit() - } + // if (val) { + // // 预使用原料信息 + // console.log('预使用原料信息') + // this.handleCancel() + // this.getDataList() + // this.materialVisible = true; + // this.addOrEditTitle = "预使用主原料信息"; + // this.$nextTick(() => { + // this.$refs.material.init(val, true); + // }); + // } else { + // this.successSubmit() + // } + this.successSubmit() }, closeDetail() { this.detailVisible = false @@ -417,7 +414,7 @@ export default { opration = '暂停' } if (val.type === 'nullify') { - param.status = 9 + param.status = 5 opration = '报废' } if (val.type === 'finish') { @@ -475,7 +472,6 @@ export default { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; - this.listQuery.pageSize = 10; this.listQuery.name = val.name ? val.name : undefined; this.listQuery.status = val.status ? val.status : undefined; this.listQuery.startProduceTime = val.time ? val.time : undefined @@ -484,7 +480,6 @@ export default { case 'reset': this.$refs.searchBarForm.resetForm(); this.listQuery = { - pageSize: 10, pageNo: 1, total: 1, }; diff --git a/src/views/produce/workOrder/workOrderNav.vue b/src/views/produce/workOrder/workOrderNav.vue index ec754008..12c5b066 100644 --- a/src/views/produce/workOrder/workOrderNav.vue +++ b/src/views/produce/workOrder/workOrderNav.vue @@ -1,23 +1,20 @@