diff --git a/src/api/ManufacturingCenter/MaterialArrival.js b/src/api/ManufacturingCenter/MaterialArrival.js new file mode 100644 index 00000000..91ff3ff5 --- /dev/null +++ b/src/api/ManufacturingCenter/MaterialArrival.js @@ -0,0 +1,72 @@ +import request from '@/utils/request' + +export function searchPartNumber(partnumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_基本件入库_零件图号', + param: '工艺计划流水号=' + partnumber + } + }) +} +// 机床名称 +export function getMachines() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + } + }) +} +// 获取组号 +export function getGroups(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', + param: '机床流水号=' + stepNumber + '=int' + } + }) +} +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新', + param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 获取组号 +export function gettabledata1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_加工进度查询_查询_New', + param: '工艺计划流水号=' + num + '=int' + } + }) +} +export function submitEdit(Number1, processSerialNumber) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '车间生产管理工艺_零件工序_修改数据_工作者_根据人员编号', + param: '人员编号=' + Number1 + '=string&工序流水号=' + processSerialNumber + '=string' + } + }) +} diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index 3a1598d6..ef7b5845 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -37,14 +37,14 @@ export function searchMateriel(num, num1) { }) } // 查询到货单 -export function searchArriveOrder(num, num1, num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) { +export function searchArriveOrder(num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询_新', - param: `供应商名称_check=${num}&供应商名称=${num1}&供应商名称_check=${num8}&供应商名称=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, + param: `供应商流水号_check=${num8}&供应商流水号=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue new file mode 100644 index 00000000..f0ea004a --- /dev/null +++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue @@ -0,0 +1,362 @@ + + + + + diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue index d383aa88..df5c59f9 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue @@ -293,7 +293,30 @@

设计

 - + +
+
组号
+
+
+
任务名称
+
+
+
计划开始时间
+
+
+
计划完成时间
+
+
+
实际完成时间
+
+
+
工期
+
+
+
备注
+
+ +