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

Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

Browse Source
This commit is contained in:
lixin
2018-12-29 19:30:20 +08:00
parent b33479864e 16bf68bd05
commit ba40c3396f
24 changed files with 352 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -115,7 +115,7 @@ export function processNameClick() {
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用'
}
})
}

66
src/api/ManufacturingCenter/RepairTimeEntry.js
View File

@@ -12,6 +12,50 @@ export function searchTechnology(num) {
}
})
}
export function getNames() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
}
})
}
export function getMachines(gongyi) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
param: '项目流水号=' + gongyi + '=int'
}
})
}
export function getGroups(stepNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
param: '机床流水号=' + stepNumber + '=int'
}
})
}
export function getParts(stepNumber, a, b, c, d, e, f, g) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_基础表_员工月修补工时_查询零件',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0'
}
})
}
// 查询人员编号
export function searchperson(num) {
return request({
@@ -31,33 +75,45 @@ export function searchtable(check, num, pageCurrent, pageSize) {
method: 'post',
data: {
type: '1',
name: '车间生产管理_基础表_员工月修补工时_查询数据',
name: '车间生产管理_基础表_员工月修补工时_查询数据_MESWORK',
param: '人员编号_check=' + check + '&人员编号=' + num,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 增加
export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) {
export function edittype(num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_增加数据',
param: '人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName
param: '工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2
}
})
}
// 编辑
export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) {
export function handlechange(CoManufacturerFlowNumber, num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_修改数据',
param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName
param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2
}
})
}
// 删除工艺信息
export function delList(MaterialCode) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_删除数据',
param: '员工月修补工时流水号=' + MaterialCode
}
})
}

8
src/api/WorkshopProcurement/AccountingPrice.js
View File

@@ -7,19 +7,19 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
name: '车间采购管理_采购合同_查询'
}
})
}
// 查询表1
export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
export function searchParts(pageCurrent, pageSize, check1, num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
name: '车间管理_核算价格_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}`,
Pagination: pageCurrent + '&' + pageSize
}
})

2
src/api/WorkshopProcurement/ProcurementContractApproval.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_未审批查询'
}
})
}

2
src/api/WorkshopProcurement/PurchaseContractChange.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_查询'
}
})
}

2
src/api/WorkshopProcurement/PurchasingQualityInspection.js
View File

@@ -7,7 +7,7 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
name: '车间采购管理_采购合同_查询'
}
})
}

17
src/api/WorkshopProcurement/QualityInspectionQuery.js
View File

@@ -7,30 +7,19 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
}
})
}
// 初始化零件
export function initParts() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_零件查询'
name: '车间采购管理_采购合同_查询'
}
})
}
// 查询表1
export function searchParts(pageCurrent, pageSize, check1, num, check2, name, check3, num1) {
export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_质检情况_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}&物料流水号_check=${check3}&物料流水号=${num1}`,
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
Pagination: pageCurrent + '&' + pageSize
}
})