4.2.0
1、bom图纸修改： 图纸改为激光切割图纸，只为激光切割工序使用；对于已派工的不能随意修改，修改有留痕。 SOP改为图纸&SOP，给所有工序下载和查看使用；对于未完成的可以随意修改，修改有留痕 2、四楼板材入库，不需要再绑定库位才能入库，操作人员自行选择，入库时扫描库位码和固定条码再输入数量等信息入库。 3、申请领料时，根据bom申请的，领料数量默认为bom的标准数量减去已申请的数量，并且申请数量不能大于标准数量；在非bom中申请bom中的物料必须输入领料原因 4、五楼装配工序领料不需要开始就可以开始。master
parent
d24fa22df2
commit
106a314a38
@ -0,0 +1,78 @@
|
||||
package com.hw.mes.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.mes.domain.MesBomAttachChange;
|
||||
|
||||
/**
|
||||
* 物料BOM信息图纸和SOP变更记录Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2025-08-22
|
||||
*/
|
||||
public interface MesBomAttachChangeMapper
|
||||
{
|
||||
/**
|
||||
* 查询物料BOM信息图纸和SOP变更记录
|
||||
*
|
||||
* @param attachChangeId 物料BOM信息图纸和SOP变更记录主键
|
||||
* @return 物料BOM信息图纸和SOP变更记录
|
||||
*/
|
||||
public MesBomAttachChange selectMesBomAttachChangeByAttachChangeId(Long attachChangeId);
|
||||
|
||||
/**
|
||||
* 查询物料BOM信息图纸和SOP变更记录列表
|
||||
*
|
||||
* @param mesBomAttachChange 物料BOM信息图纸和SOP变更记录
|
||||
* @return 物料BOM信息图纸和SOP变更记录集合
|
||||
*/
|
||||
public List<MesBomAttachChange> selectMesBomAttachChangeList(MesBomAttachChange mesBomAttachChange);
|
||||
|
||||
/**
|
||||
* 新增物料BOM信息图纸和SOP变更记录
|
||||
*
|
||||
* @param mesBomAttachChange 物料BOM信息图纸和SOP变更记录
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesBomAttachChange(MesBomAttachChange mesBomAttachChange);
|
||||
|
||||
/**
|
||||
* 修改物料BOM信息图纸和SOP变更记录
|
||||
*
|
||||
* @param mesBomAttachChange 物料BOM信息图纸和SOP变更记录
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesBomAttachChange(MesBomAttachChange mesBomAttachChange);
|
||||
|
||||
/**
|
||||
* 删除物料BOM信息图纸和SOP变更记录
|
||||
*
|
||||
* @param attachChangeId 物料BOM信息图纸和SOP变更记录主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBomAttachChangeByAttachChangeId(Long attachChangeId);
|
||||
|
||||
/**
|
||||
* 批量删除物料BOM信息图纸和SOP变更记录
|
||||
*
|
||||
* @param attachChangeIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBomAttachChangeByAttachChangeIds(Long[] attachChangeIds);
|
||||
|
||||
/**
|
||||
* 批量新增物料BOM信息图纸和SOP变更记录
|
||||
*
|
||||
* @param mesBomAttachChangeList 物料BOM信息图纸和SOP变更记录列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int batchMesBomAttachChange(List<MesBomAttachChange> mesBomAttachChangeList);
|
||||
|
||||
|
||||
/**
|
||||
* 关联查询物料BOM信息图纸和SOP变更记录列表,join mes_base_attach_info
|
||||
*
|
||||
* @param mesBomAttachChange 物料BOM信息图纸和SOP变更记录
|
||||
* @return 物料BOM信息图纸和SOP变更记录集合
|
||||
*/
|
||||
public List<MesBomAttachChange> selectMesBomAttachChangeJoinList(MesBomAttachChange mesBomAttachChange);
|
||||
}
|
||||
@ -0,0 +1,194 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
|
||||
<el-form-item label="文件类型" prop="attachType">
|
||||
<el-radio-group v-model="queryParams.attachType" clearable @keyup.enter.native="handleQuery">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.mes_attach_type"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{ dict.label }}
|
||||
</el-radio>
|
||||
</el-radio-group>
|
||||
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="变更类型" prop="changeType">
|
||||
<el-select v-model="queryParams.changeType" placeholder="请选择变更类型" clearable @keyup.enter.native="handleQuery">
|
||||
<el-option
|
||||
v-for="dict in dict.type.mes_attach_change_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="更新人" prop="changeBy">
|
||||
<el-input
|
||||
v-model="queryParams.changeBy"
|
||||
placeholder="请输入更新人"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-table v-loading="loading" :data="attachChangeList" @selection-change="handleSelectionChange">
|
||||
<el-table-column label="文件类型" align="center" prop="attachType" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.mes_attach_type" :value="scope.row.attachType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="变更类型" align="center" prop="changeType" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.mes_attach_change_type" :value="scope.row.changeType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="文件名称" align="center" prop="attachName" />
|
||||
<el-table-column label="更新人" align="center" prop="changeBy" />
|
||||
<el-table-column label="更新时间" align="center" prop="changeTime" width="180">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="text"
|
||||
icon="el-icon-download"
|
||||
@click="handleDownload(scope.row)"
|
||||
>下载</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {selectMesBomAttachChangeJoinList} from "@/api/mes/materialBom";
|
||||
|
||||
export default {
|
||||
name: "AttachChange",
|
||||
dicts: ['mes_attach_type', 'mes_attach_change_type'],
|
||||
props: {
|
||||
defineData: {
|
||||
type: Object,
|
||||
default: {}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 物料BOM信息图纸和SOP变更记录表格数据
|
||||
attachChangeList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
materialBomId: null,
|
||||
oldAttachId: null,
|
||||
newAttachId: null,
|
||||
changeType: null,
|
||||
planId: null,
|
||||
planCode: null,
|
||||
changeUserId: null,
|
||||
changeBy: null,
|
||||
changeTime: null
|
||||
},
|
||||
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getData();
|
||||
},
|
||||
methods: {
|
||||
getData() {
|
||||
if (this.defineData.materialBomId) {
|
||||
this.queryParams.materialBomId = this.defineData.materialBomId;
|
||||
this.getList();
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
/** 查询物料BOM信息图纸和SOP变更记录列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
selectMesBomAttachChangeJoinList(this.queryParams).then(response => {
|
||||
this.attachChangeList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
attachChangeId: null,
|
||||
materialBomId: null,
|
||||
oldAttachId: null,
|
||||
newAttachId: null,
|
||||
changeType: null,
|
||||
planId: null,
|
||||
planCode: null,
|
||||
changeUserId: null,
|
||||
changeBy: null,
|
||||
changeTime: null
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
/** 下载文件操作 */
|
||||
handleDownload(row) {
|
||||
if (row.attachPath) {
|
||||
// 在新标签页中打开下载链接
|
||||
window.open(row.attachPath, '_blank');
|
||||
} else {
|
||||
this.$message.error('文件路径不存在，无法下载');
|
||||
}
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue