diff --git a/klp-ui/src/api/wms/annealOperateEvent.js b/klp-ui/src/api/wms/annealOperateEvent.js new file mode 100644 index 00000000..0768be8b --- /dev/null +++ b/klp-ui/src/api/wms/annealOperateEvent.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询退火操作事件列表 +export function listAnnealOperateEvent(query) { + return request({ + url: '/wms/annealOperateEvent/list', + method: 'get', + params: query + }) +} + +// 查询退火操作事件详细 +export function getAnnealOperateEvent(eventId) { + return request({ + url: '/wms/annealOperateEvent/' + eventId, + method: 'get' + }) +} + +// 新增退火操作事件 +export function addAnnealOperateEvent(data) { + return request({ + url: '/wms/annealOperateEvent', + method: 'post', + data: data + }) +} + +// 修改退火操作事件 +export function updateAnnealOperateEvent(data) { + return request({ + url: '/wms/annealOperateEvent', + method: 'put', + data: data + }) +} + +// 删除退火操作事件 +export function delAnnealOperateEvent(eventId) { + return request({ + url: '/wms/annealOperateEvent/' + eventId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/wms/anneal/plan/ctrl.vue b/klp-ui/src/views/wms/anneal/plan/ctrl.vue index 697fc9ba..9972180f 100644 --- a/klp-ui/src/views/wms/anneal/plan/ctrl.vue +++ b/klp-ui/src/views/wms/anneal/plan/ctrl.vue @@ -264,6 +264,7 @@ import { listAnnealFurnace } from "@/api/wms/annealFurnace"; import { listMaterialCoil } from "@/api/wms/coil"; import { listWarehouse } from '@/api/wms/warehouse' import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; +import { addAnnealOperateEvent } from "@/api/wms/annealOperateEvent"; export default { name: "AnnealPlan", @@ -388,6 +389,7 @@ export default { this.completeLoading = true; listAnnealPlanCoils(this.currentPlan.planId).then(response => { this.completeCoils = (response.data || []).map(item => ({ + ...item, coilId: item.coilId, enterCoilNo: item.enterCoilNo, warehouseId: item.logicWarehouseId || null @@ -543,6 +545,14 @@ export default { }); this.loading = true; await inFurnace({ planId: row.planId }); + // 炉火开始加工 + const targetFurnaceName = this.furnaceOptions.find(item => item.furnaceId === row.targetFurnaceId)?.furnaceName || ''; + addAnnealOperateEvent({ + annealFurnaceId: row.targetFurnaceId, + operateType: 'IN', + operateContent: '退火炉' + targetFurnaceName + '开始加工', + }) + // anneal-todo: 新增操作事件 this.loading = false; row.status = 2; @@ -571,6 +581,12 @@ export default { locations: locations }).then(() => { // anneal-todo: 新增操作事件 + const targetFurnaceName = this.furnaceOptions.find(item => item.furnaceId === this.currentPlan.targetFurnaceId)?.furnaceName || ''; + addAnnealOperateEvent({ + annealFurnaceId: this.currentPlan.targetFurnaceId, + operateType: 'COMPLETE', + operateContent: '退火炉' + targetFurnaceName + '完成加工。', + }) this.$message.success('已完成'); this.completeOpen = false; this.getList(); diff --git a/klp-ui/src/views/wms/anneal/plan/index.vue b/klp-ui/src/views/wms/anneal/plan/index.vue index ec65e6a1..9d37c77c 100644 --- a/klp-ui/src/views/wms/anneal/plan/index.vue +++ b/klp-ui/src/views/wms/anneal/plan/index.vue @@ -67,8 +67,8 @@