diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index e4320d48..9375414f 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -69,3 +69,15 @@ export function getTable2(stepNumber) {
}
})
}
+// 正在加工零件
+export function searchParts(stepNumber) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序',
+ param: '终端编号=' + stepNumber
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index 967b1234..26adb5f7 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -34,14 +34,14 @@ export function getGroups(stepNumber) {
})
}
-export function getTable(stepNumber, a, b, c, d, e, f, g, pageCurrent, pageSize) {
+export function getTable(stepNumber, a, b, c, d, e, f, g, h, i, j, k, pageCurrent, pageSize) {
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',
+ param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0&开始时间_check=' + h + '&开始时间=' + i + '&结束时间_check=' + j + '&结束时间=' + k,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/api/TechnologyCenter/QueryParts.js
index 772fec3c..978af21b 100644
--- a/src/api/TechnologyCenter/QueryParts.js
+++ b/src/api/TechnologyCenter/QueryParts.js
@@ -6,7 +6,7 @@ export function projectSelect() {
method: 'post',
data: {
type: '1',
- name: 'PDM_项目名称_查询数据'
+ name: 'PDM_项目名称_查询数据_按时间排序'
}
})
}
diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
new file mode 100644
index 00000000..791ef478
--- /dev/null
+++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+// 查询库存数
+export function searchInventoryNum(pageCurrent, pageSize, check1, name, check2, state1, state2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_离线合同_物料余量_查询数据',
+ param: `物料名称_check=${check1}&物料名称=${name}&库存状态_check=${check2}&库存状态=${state1}&采购状态=${state2}`,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
diff --git a/src/api/WorkshopProcurement/ProjectTotalSearch.js b/src/api/WorkshopProcurement/ProjectTotalSearch.js
index eb903600..049db1a5 100644
--- a/src/api/WorkshopProcurement/ProjectTotalSearch.js
+++ b/src/api/WorkshopProcurement/ProjectTotalSearch.js
@@ -7,7 +7,7 @@ export function initProject() {
method: 'post',
data: {
type: '1',
- name: 'PDM_项目名称_查询数据'
+ name: 'PDM_项目名称_查询数据_按时间排序'
}
})
}
diff --git a/src/utils/request.js b/src/utils/request.js
index f4f36407..657a98da 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,7 +3,7 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
-export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
+export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 7280d65a..6031ff66 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -3,7 +3,7 @@
工位号:
-
+
- 查询
+ 刷新工位
+ 加工零件: {{ Parts }};加工工序: {{ gongxu }}
+ 无正在加工零件
调序权限
-
+
@@ -329,10 +331,19 @@
+
+