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

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

Browse Source
This commit is contained in:
liushuai
2020-04-14 20:17:10 +08:00
parent d40d67c5ca ec2394249c
commit 083cab6815
12 changed files with 132 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/Outsourcing/OutsourcingTaskExecution.js
View File

@@ -115,7 +115,7 @@ export function editData1(Number, manufacturers, freight, Explain) {
})
}
// 新建外协加工任务单
export function addTable(contractNumber, personNum, manufacturers, time, freight) {
export function addTable(contractNumber, personNum, manufacturers, time, time2, freight) {
return request({
url: '',
method: 'post',
@@ -124,12 +124,12 @@ export function addTable(contractNumber, personNum, manufacturers, time, freight
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_增加数据',
param: '表单号=' + contractNumber + '=string&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '=int&任务下达日期=' + time + '=string&运费=' + freight + '=int'
param: '表单号=' + contractNumber + '&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '&任务下达日期=' + time + '&到货日期=' + time2 + '&运费=' + freight
}
})
}
// 外协加工任务单修改
export function editData(Number, manufacturers, freight, Explain) {
export function editData(Number, manufacturers, freight, Explain, time2) {
return request({
url: '',
method: 'post',
@@ -138,7 +138,7 @@ export function editData(Number, manufacturers, freight, Explain) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain
param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain + '&到货日期=' + time2
}
})
}
@@ -152,7 +152,7 @@ export function deleteData(Number) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_删除数据',
param: '外协加工任务单流水号=' + Number + '=int'
param: '外协加工任务单流水号=' + Number
}
})
}
@@ -166,7 +166,7 @@ export function deleteData1(Number) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单明细_删除数据',
param: '外协加工任务单明细流水号=' + Number + '=int'
param: '外协加工任务单明细流水号=' + Number
}
})
}
@@ -181,7 +181,7 @@ export function getNumber(time) {
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理_外协加工任务单_查询数据_单据编号',
param: '任务下达日期=' + time + '=string&表单号=1=string=output'
param: '任务下达日期=' + time + '&表单号=1=string=output'
}
})
}

1
src/api/TechnologyCenter/ImportParts.js
View File

@@ -420,6 +420,7 @@ export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num
}
})
}
// 传递零件
export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, num8, num9, id, oldId, oldNum, peopleid) {
return request({