meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

自制件出库

Browse Source
This commit is contained in:
bryan sun
2019-12-11 17:19:31 +08:00
parent e1b25d19e2
commit 56f5781ebc
12 changed files with 379 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/api/Inventory/SelfMadePartsWarehouseOut.js Normal file
View File

@@ -0,0 +1,83 @@
import request from '@/utils/request'
export function initProject() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
}
})
}
// 查询机床
export function searchmachine(num, check) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0'
}
})
}
// 获取组号
export function searchgroup(num, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_组件名称_查询数据',
param: '机床流水号=' + num
}
})
}
// 获取表单
export function searchdata(entryNameValue_check, entryNameValue, machineToolValue_check, machineToolValue, groupNumberValue_check, groupNumberValue, partNumber_check, partNumber, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '自制件出库_查询数据',
param: '项目流水号_check=' + entryNameValue_check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + machineToolValue_check + '&机床流水号=' + machineToolValue + '&组件流水号_check=' + groupNumberValue_check + '&组件流水号=' + groupNumberValue + '&零件图号_check=' + partNumber_check + '&零件图号=' + partNumber,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 自制件出库
export function warehousing(processPlanSerialNumber, leader, remarks) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '自制件出库_循环执行_新',
param: '工艺计划流水号组=' + processPlanSerialNumber + '&考勤编号=' + leader + '&出库备注=' + remarks
}
})
}
export function selectdepartment() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '出库管理_部门查询'
}
})
}
export function selectleaders(department) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '出库管理_人员查询',
param: '考核部门编号=' + department
}
})
}

6
src/utils/request.js
View File

@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel
export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.0.110:8002/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.0.110:8002/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

2
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -3,7 +3,7 @@
<el-card style="width: 1000px">
<el-row>
<span style="margin-left: 10px">零件图号</span>
<el-input v-model="Partpaint" clearable size="small" style="width:200px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
<el-input v-model="Partpaint" clearable size="small" style="width:170px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="清除所有机床零件信息" placement="top">
<el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>

8
src/views/Inventory/OutPartSelect/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<span style="margin-left: 10px">机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 185px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -13,7 +13,7 @@
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 100px;">
<el-option
v-for="item in Groups"
:key="item.value"
@@ -21,7 +21,7 @@
:value="item.value"/>
</el-select>
<span>零件图号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
</el-card>
@@ -62,7 +62,7 @@
</el-table-column>
<el-table-column align="center" label="领料人" prop="出库备注" width="80px">
<template slot-scope="scope">
{{ scope.row.出库备注 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库时间" prop="出库时间" width="100px">

269
src/views/Inventory/SelfMadePartsWarehouseOut/index.vue Normal file
View File

@@ -0,0 +1,269 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">
<el-option
v-for="item in machineTool"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;margin: 10px 10px 0px 10px">
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
<el-button type="primary" size="small" style="margin: 15px 0 0 10px" @click="wareHousing">出库</el-button>
</el-row>
</el-card>
<el-card>
<el-table :data="tableData" style="width: 760px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="45"/>
<el-table-column align="center" label="序号" type="index" width="55px"/>
<el-table-column align="center" label="机床图号" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="80px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" min-width="180px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" min-width="180px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" width="50px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="状态" width="80px">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="scope.row.考核状态 === '8'">入库</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="出库信息" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left">
<el-form-item label="部门" prop="部门" label-width="100px" size="small">
<!-- <el-input v-model="form.department" size="small" placeholder="请输入人员编号" style="width: 200px"/>-->
<el-select v-model="form.department" placeholder="请选择部门" size="small" clearable style="width: 200px;" @change="selectLeaders">
<el-option
v-for="item in departments"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="领料人" prop="领料人" label-width="100px" size="small">
<el-select v-model="form.name" placeholder="请选择领料人" size="small" clearable style="width: 200px;">
<el-option
v-for="item in leaders"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="人员编号" prop="leader" label-width="100px" size="small">
<el-input v-model="form.leader" size="small" placeholder="请输入人员编号" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible=false">取消</el-button>
<el-button type="primary" @click="CHUKU()">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
// import { url } from '@/utils/request'
// import axios from 'axios'
import { initProject, searchmachine, searchgroup, searchdata, warehousing, selectdepartment, selectleaders } from '@/api/Inventory/SelfMadePartsWarehouseOut'
export default {
data() {
return {
entryNameValue: '', // 项目名称
entryName: [],
machineToolValue: '', // 机床号
machineTool: [],
groupNumberValue: '', // 组号
groupNumber: [],
partNumber: '',
pageCurrent: 1,
pageSize: 20,
total: 0,
tableData: [],
multipleSelection: [],
dialogFormVisible: false,
processPlanSerialNumber: '', // 工艺计划流水号
remarks: '',
form: {
leader: '',
name: ''
},
rules: {
leader: [{ required: true, message: '请输入' }]
},
departments: [], // 部门
leaders: [] // 领料人
}
},
created() {
this.fetchData()
this.searchData()
},
methods: {
searchData() {
const entryNameValue_check = this.entryNameValue === '' || this.entryNameValue === null ? 0 : 1
const machineToolValue_check = this.machineToolValue === '' || this.machineToolValue === null ? 0 : 1
const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1
const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1
searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows
this.total = response.data.total
})
},
selectDepartment() {
selectdepartment().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.departments.push({
label: response.data[i].部门名称,
value: response.data[i].考核部门编号
})
}
})
},
selectLeaders() {
selectleaders(this.form.department).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.leaders.push({
label: response.data[i].姓名,
value: response.data[i].考勤编号
})
}
})
},
fetchData() {
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.entryName.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
})
}
})
},
// 查询机床
SearchMachine() {
this.machineToolValue = ''
this.machineTool = []
this.groupNumberValue = ''
this.groupNumber = []
if (this.entryNameValue) {
searchmachine(this.entryNameValue, 1).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineTool.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
}
},
// 查询组号
searchGroupList() {
this.groupNumberValue = ''
this.groupNumber = []
if (this.machineToolValue) {
searchgroup(this.machineToolValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNumber.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
}
}, // 入库
wareHousing() {
console.log(this.multipleSelection, 121212)
if (this.multipleSelection.length === 0) {
this.$message.warning('请勾选出库物料')
} else {
this.selectDepartment()
this.dialogFormVisible = true
this.form.leader = ''
}
}, // 多选
handleSelectionChange(val) {
this.multipleSelection = []
val.map(v => {
this.multipleSelection.push(v.工艺计划流水号)
})
},
CHUKU() {
console.log(this.form.name, 909090, this.form.leader)
if (Number(this.form.leader) === Number(this.form.name)) {
warehousing(this.multipleSelection, this.form.leader, this.remarks).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.dialogFormVisible = false
this.searchData()
} else {
this.$message.error('出库失败')
this.dialogFormVisible = false
}
})
} else {
this.$message.error('人员编号错误')
}
},
handleSizeChange(val) {
this.pageSize = val
this.searchData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchData()
}
}
}
</script>
<style scoped>
</style>

10
src/views/Inventory/StockInquiry/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<span style="margin-left: 10px">机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 120px" placeholder="机床号" @change="getGroup()">
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 185px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -13,7 +13,7 @@
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 120px;">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 100px;">
<el-option
v-for="item in Groups"
:key="item.value"
@@ -21,7 +21,7 @@
:value="item.value"/>
</el-select>
<span>零件图号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 120px;"/>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
</el-card>
@@ -121,9 +121,9 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料人" prop="出库备注" width="80px">
<el-table-column align="center" label="领料人" prop="领料人" width="80px">
<template slot-scope="scope">
{{ scope.row.出库备注 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库时间" prop="出库时间" width="100px">

6
src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
View File

@@ -37,11 +37,11 @@
</el-row>
<el-row>
<span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:120px; margin-top: 10px;margin-bottom: 10px"/>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:100px; margin-top: 10px;margin-bottom: 10px"/>
<span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:150px"/>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:170px"/>
<span>工艺名称:</span>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:150px"/>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:100px"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="新增补录工时" placement="top">
<el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>

2
src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
View File

@@ -3,7 +3,7 @@
<el-card>
<span>工位号:</span>
<el-select v-model="MachineValue" filterable size="small" style="width:220px;margin-bottom:10px" placeholder="工位号" @change="searchTable();searchParts()">
<el-select v-model="MachineValue" filterable size="small" style="width:120px;margin-bottom:10px" placeholder="工位号" @change="searchTable();searchParts()">
<el-option
v-for="item in Machine"
:key="item.value"

4
src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
View File

@@ -3,7 +3,7 @@
<el-card>
<el-row>
<span>机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 185px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -22,7 +22,7 @@
:value="item.value"/>
</el-select>
<span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row>
<el-row v-if="false">

6
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -12,14 +12,14 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 100px;" @change="getTableData">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
</el-card>
<el-row>

2
src/views/ManufacturingCenter/ShopScheduling/index.vue
View File

@@ -4,7 +4,7 @@
<el-col style="width: 610px">
<el-card style="height: 680px">
<el-row style="margin-top: 5px">
<el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 150px" @keyup.enter.native="getParts"/>
<el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 170px" @keyup.enter.native="getParts"/>
<el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
<el-option
v-for="item in Person"

8
src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
View File

@@ -2,7 +2,7 @@
<div>
<el-card>
<span>项目名称</span>
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small" style="width: 185px">
<el-option
v-for="item in project"
:key="item.value"
@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<span>机床图号</span>
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small" style="width: 185px">
<el-option
v-for="item in machine"
:key="item.value"
@@ -18,14 +18,14 @@
:value="item.value"/>
</el-select>
<span>组号</span>
<el-select v-model="groupValue" placeholder="请选择组号" filterable size="small">
<el-select v-model="groupValue" placeholder="请选择组号" filterable size="small" style="width: 100px">
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="whetherToImport" clearable placeholder="是否导入" filterable size="small">
<el-select v-model="whetherToImport" clearable placeholder="是否导入" filterable size="small" style="width: 100px">
<el-option
v-for="item in whetherToImports"
:key="item.value"