diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js
index d27a4851..72682aef 100644
--- a/src/api/ManufacturingCenter/CreatePreparationBill.js
+++ b/src/api/ManufacturingCenter/CreatePreparationBill.js
@@ -25,7 +25,7 @@ export function searchtable2(num1) {
}
})
}
-// 更改打印状态
+// 自家备料
export function edit(num1) {
return request({
url: '',
@@ -37,3 +37,15 @@ export function edit(num1) {
}
})
}
+// 外购备料
+export function edit2(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '车间生产管理工艺_备料单导出_外购备料',
+ param: '工艺计划流水号=' + num1
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index 9375414f..ad8dd709 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -64,7 +64,7 @@ export function getTable2(stepNumber) {
method: 'post',
data: {
type: '1',
- name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序',
+ name: '车间生产管理工艺_零件工序_查询数据_加工顺序调整查询',
param: '项目流水号_check=0&项目流水号=0&机床流水号_check=0&机床流水号=0&组件流水号_check=0&组件流水号=0&零件图号_check=1=string&零件图号=' + stepNumber + '=string&是否查询全部数据=1=string&单件是否外协=1&考核状态=6=int'
}
})
@@ -81,3 +81,27 @@ export function searchParts(stepNumber) {
}
})
}
+// 跳序权限
+export function JurisdictionContro2(num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '车间生产管理工艺_加工顺序调整_更改跳序权限',
+ param: 'MES终端号=' + num1 + '&变更类型=' + num2
+ }
+ })
+}
+// 撤出零件
+export function outParts(code) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: 2,
+ name: '车间生产管理工艺_零件撤出待加工库',
+ param: '工艺计划流水号=' + code + '&结果=11111=string=output'
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
index 3379898b..3bd60bb2 100644
--- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js
+++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
@@ -48,3 +48,14 @@ export function change(Number, code, num) {
}
})
}
+export function change2(Number, code, num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '车间生产管理工艺_外购备料到货更改',
+ param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index f5019a57..e27efdec 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -26,8 +26,9 @@ export function searchmachine(num, check, pageCurrent, pageSize) {
method: 'post',
data: {
type: '1',
- name: 'PDM_机床名称_查询数据_分页',
- param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_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: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0',
+ Pagination: pageCurrent + '&' + pageSize
}
})
}
@@ -37,8 +38,9 @@ export function searchgroup(num, pageCurrent, pageSize) {
method: 'post',
data: {
type: '1',
- name: 'PDM_组件名称_查询数据_分页',
- param: '机床流水号=' + num + '=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
+ name: 'PDM_组件名称_查询数据',
+ param: '机床流水号=' + num,
+ Pagination: pageCurrent + '&' + pageSize
}
})
}
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index fe0d40b5..b02d2c11 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -7,7 +7,8 @@
查询
查询全部
导出备料单
- 导出完成
+ 自家备料
+ 外购备料
@@ -104,7 +105,7 @@