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-25 17:25:05 +08:00
parent 866971dc4a be42004625
commit 44dd68f62e
18 changed files with 743 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/Inventory/SelfMadePartsWarehouseOut.js
View File

@@ -49,14 +49,14 @@ export function searchdata(entryNameValue_check, entryNameValue, machineToolValu
})
}
// 自制件出库
export function warehousing(processPlanSerialNumber, leader, remarks) {
export function warehousing(processPlanSerialNumber, outgoingQuantity, leader, remarks) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '自制件出库_循环执行_新',
param: '工艺计划流水号组=' + processPlanSerialNumber + '&考勤编号=' + leader + '&出库备注=' + remarks
param: '工艺计划流水号组=' + processPlanSerialNumber + '&出库数量组=' + outgoingQuantity + '&考勤编号=' + leader + '&出库备注=' + remarks
}
})
}

31
src/api/ManufacturingCenter/DiscardedPartsInquiry.js
View File

@@ -1,25 +1,24 @@
import request from '@/utils/request'
// 初始化项目名称
export function initProject() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
}
})
}
// // 初始化项目名称
// export function initProject() {
// return request({
// url: '',
// method: 'post',
// data: {
// type: '1',
// name: 'PDM_项目名称_查询数据_按时间排序'
// }
// })
// }
// 用项目查机床
export function searchMachine(num) {
export function searchMachine() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据2',
param: '项目流水号=' + num
name: 'PDM_项目名称_查询数据'
}
})
}
@@ -58,14 +57,14 @@ export function searchTable1(num) {
}
})
}
export function searchTable2(check, entryNameValue, check1, machineNameValue, pageCurrent1, pageSize1) {
export function searchTable2(check1, machineNameValue, pageCurrent1, pageSize1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_零件报废补投_查询数据_按机床查询',
param: '项目流水号_check=' + check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '&机床流水号=' + machineNameValue,
param: '机床流水号_check=' + check1 + '&机床流水号=' + machineNameValue,
pagination: pageCurrent1 + '&' + pageSize1
}
})

57
src/api/ManufacturingCenter/GroupMatching.js
View File

@@ -1,80 +1,57 @@
import request from '@/utils/request'
export function initProject() {
export function searchmachine() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基本件成组配套_查询项目名称'
name: '机床名称流水号_查询数据'
}
})
}
export function searchmachine(num, check, pageCurrent, pageSize) {
export function searchgroup(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据_分页',
param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '=int&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
name: 'PDM_组件名称_查询数据_新',
param: '机床流水号=' + num + '=int'
}
})
}
export function searchgroup(num, pageCurrent, pageSize) {
export function searchTable(check1, machine, check2, groupNum, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_组件名称_查询数据_分页',
param: '机床流水号=' + num + '=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
}
})
}
export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基本件成组配套_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
name: '车间生产管理工艺_基本件成组配套_查询数据_新',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
pagination: pageCurrent + '&' + pageSize
}
})
}
export function searchTable22(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time) {
export function searchTable22(check1, machine, check2, groupNum, check3, year, check4, month, check5, time) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基本件成组配套_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string'
name: '车间生产管理工艺_基本件成组配套_查询数据_新',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string'
}
})
}
export function searchPurchaseTable(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) {
export function searchTable1(check1, machine, check2, groupNum, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_外购件成组配套_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string',
pagination: pageCurrent + '&' + pageSize
}
})
}
export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_车间采购出库_零件查询',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
name: '库存管理_车间采购出库_零件查询_新',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
pagination: pageCurrent + '&' + pageSize
}
})
@@ -110,9 +87,9 @@ export function searchTable02(...params) {
method: 'post',
data: {
type: '1',
name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商',
param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}`,
Pagination: params[6] + '&' + params[7]
name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_成组配套',
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
Pagination: params[4] + '&' + params[5]
}
})
}

31
src/api/ManufacturingCenter/SparePartsForScrap.js
View File

@@ -1,23 +1,22 @@
import request from '@/utils/request'
export function ProjectNameSelect(stateID) {
// export function ProjectNameSelect(stateID) {
// return request({
// url: '',
// method: 'post',
// data: {
// type: '1',
// name: '车间生产管理工艺_传递后_项目名称_查询数据',
// param: '考核状态=' + stateID + '=int'
// }
// })
// }
export function MachineDrawingSelect() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_项目名称_查询数据',
param: '考核状态=' + stateID + '=int'
}
})
}
export function MachineDrawingSelect(ProjectCode) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
param: '项目流水号=' + ProjectCode + '=int'
name: 'PDM_项目名称_查询数据'
}
})
}
@@ -32,14 +31,14 @@ export function TeamSelect(MachineCode) {
}
})
}
export function TableDataSelect(ProjectCode_check, ProjectCode, MachineCode_check, MachineCode, TeamCode_check, TeamCode, ComponentPartsBasicCattleTaxNumber_check, ComponentPartsBasicCattleTaxNumber, CutCode_check, CutCode, CutCodeBefore_check, CutCodeBefore, Assess_check, Assess, PartDrawing_check, PartDrawing, currentPage1, pageSize1) {
export function TableDataSelect(MachineCode_check, MachineCode, TeamCode_check, TeamCode, ComponentPartsBasicCattleTaxNumber_check, ComponentPartsBasicCattleTaxNumber, CutCode_check, CutCode, CutCodeBefore_check, CutCodeBefore, Assess_check, Assess, PartDrawing_check, PartDrawing, currentPage1, pageSize1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_零件报废补投_查询数据',
param: '项目流水号_check=' + ProjectCode_check + '=int&项目流水号=' + ProjectCode + '=string&机床流水号_check=' + MachineCode_check + '=int&机床流水号=' + MachineCode + '=string&组件流水号_check=' + TeamCode_check + '=int&组件流水号=' + TeamCode + '=string&组件零件基本件流水号_check=' + ComponentPartsBasicCattleTaxNumber_check + '=int&组件零件基本件流水号=' + ComponentPartsBasicCattleTaxNumber + '=string&工艺计划流水号_check=' + CutCode_check + '=int&工艺计划流水号=' + CutCode + '=string&工艺计划流水号_补投前_check=' + CutCodeBefore_check + '=int&工艺计划流水号_补投前=' + CutCodeBefore + '=string&考核状态_check=' + Assess_check + '=int&考核状态=' + Assess + '=string&零件图号_check=' + PartDrawing_check + '=int&零件图号=' + PartDrawing + '=string',
param: '机床流水号_check=' + MachineCode_check + '=int&机床流水号=' + MachineCode + '=string&组件流水号_check=' + TeamCode_check + '=int&组件流水号=' + TeamCode + '=string&组件零件基本件流水号_check=' + ComponentPartsBasicCattleTaxNumber_check + '=int&组件零件基本件流水号=' + ComponentPartsBasicCattleTaxNumber + '=string&工艺计划流水号_check=' + CutCode_check + '=int&工艺计划流水号=' + CutCode + '=string&工艺计划流水号_补投前_check=' + CutCodeBefore_check + '=int&工艺计划流水号_补投前=' + CutCodeBefore + '=string&考核状态_check=' + Assess_check + '=int&考核状态=' + Assess + '=string&零件图号_check=' + PartDrawing_check + '=int&零件图号=' + PartDrawing + '=string',
Pagination: currentPage1 + '&' + pageSize1
}
})

31
src/api/ManufacturingCenter/StatusQuery.js
View File

@@ -1,15 +1,15 @@
import request from '@/utils/request'
export function initProject() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
}
})
}
// export function initProject() {
// return request({
// url: '',
// method: 'post',
// data: {
// type: '1',
// name: 'PDM_项目名称_查询数据_按时间排序'
// }
// })
// }
export function intPartState() {
return request({
url: '',
@@ -20,14 +20,13 @@ export function intPartState() {
}
})
}
export function searchmachine(num, check) {
export function searchmachine() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0'
name: 'PDM_项目名称_查询数据'
}
})
}
@@ -42,14 +41,14 @@ export function searchgroup(num, pageCurrent, pageSize) {
}
})
}
export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageCurrent, pageSize) {
export function searchTable(check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_最新_MESWORK',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
Pagination: pageCurrent + '&' + pageSize
}
})

36
src/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js
View File

@@ -23,3 +23,39 @@ export function getData1(num) {
}
})
}
export function getData2(date1, date2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_合同审核审批效率_查询数据_折线图',
param: '开始时间=' + date1 + '&结束时间=' + date2
}
})
}
export function getData3(date1, date2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_合同审批效率_查询数据_折线图',
param: '开始时间=' + date1 + '&结束时间=' + date2
}
})
}
export function getData4(date1, date2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_请款审批付款效率_查询数据_折线图',
param: '开始时间=' + date1 + '&结束时间=' + date2
}
})
}

29
src/api/TechnologyCenter/QueryParts.js
View File

@@ -1,24 +1,23 @@
import request from '@/utils/request'
export function projectSelect() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
}
})
}
// export function projectSelect() {
// return request({
// url: '',
// method: 'post',
// data: {
// type: '1',
// name: 'PDM_项目名称_查询数据_按时间排序'
// }
// })
// }
export function machineSelect(projectValue) {
export function machineSelect() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据2',
param: `项目流水号=${projectValue}`
name: 'PDM_项目名称_查询数据'
}
})
}
@@ -35,14 +34,14 @@ export function groupSelect(machineValue) {
})
}
export function basicPartsData(project_check, project, machine_check, machine, group_check, group, pageSize, pageCurrent) {
export function basicPartsData(machine_check, machine, group_check, group, pageSize, pageCurrent) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_基本件_查询数据_综合gj',
param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`,
param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`,
Pagination: pageCurrent + '&' + pageSize
}
})