From feb2529e7e0d149975e11b682d369923058b878d Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 30 May 2019 15:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/CreateIntakeList.js | 187 +++ .../MaterialArrivalManagement.js | 12 + src/api/ManufacturingCenter/SparePartsOut.js | 88 ++ .../CreatingPurchasingMaterials.js | 27 + .../CreateIntakeList/index.vue | 1139 +++++++++++++++++ .../MaterialArrivalManagement/index.vue | 83 +- .../SparePartsOut/index.vue | 294 +++++ .../CreatingPurchasingMaterials/index.vue | 180 +-- 8 files changed, 1876 insertions(+), 134 deletions(-) create mode 100644 src/api/ManufacturingCenter/CreateIntakeList.js create mode 100644 src/api/ManufacturingCenter/SparePartsOut.js create mode 100644 src/views/ManufacturingCenter/CreateIntakeList/index.vue create mode 100644 src/views/ManufacturingCenter/SparePartsOut/index.vue diff --git a/src/api/ManufacturingCenter/CreateIntakeList.js b/src/api/ManufacturingCenter/CreateIntakeList.js new file mode 100644 index 00000000..30f32faa --- /dev/null +++ b/src/api/ManufacturingCenter/CreateIntakeList.js @@ -0,0 +1,187 @@ +import request from '@/utils/request' + +// 初始化项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_按时间排序' + } + }) +} +// 机床查询 +export function searchmachine(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} +// 分组查询 +export function searchTeam(machineNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + machineNumber + } + }) +} +// 外购件、标准件查询 +export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_外购件出库_零件查询', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 基本件、通用件查询 +export function searchBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_基本件出库_零件查询', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 车间采购件查询 +export function searchHoursePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_车间采购出库_零件查询', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 领料单查询 +export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_领料单查询', + param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} + +// 领料单明细查询 +export function searchListDetail(listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_领料单明细查询', + param: '领料单流水号=' + listNumber + } + }) +} +// 创建领料单 +export function addList(peopleNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单增加', + param: '领料人流水号=' + peopleNumber + } + }) +} +// 删除领料单 +export function dropList(PickingListNumberx) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单删除', + param: '领料单流水号=' + PickingListNumberx + } + }) +} +// 删除领料单明细 +export function dropListDetail(DetailNumberx, isBacklog) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单明细删除', + param: '领料单明细流水号=' + DetailNumberx + '&是否是滞货=' + isBacklog + } + }) +} +// 删除领料单明细/基本件 +export function dropListDetailBasic(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单明细删除_基本件', + param: `领料单明细流水号=${params[0]}&收件信息ID=${params[1]}&返还数量=${params[2]}` + } + }) +} +// 增加领料单明细 +export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单明细增加', + param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注\\=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格\\=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13 + } + }) +} +// 查询滞货件 +export function searchBacklogPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_滞货件领料_查询数据', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 领料滞货件 +export function submitAddBacklogList(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_领料单明细_滞货件_增加数据', + param: `领料单流水号=${params[0]}&项目流水号=${params[1]}&机床流水号=${params[2]}&组件流水号=${params[3]}&出库数量=${params[4]}&备注\\=${params[5]}&货位流水号=${params[6]}&物料与货位对照流水号=${params[7]}&名称=${params[8]}&物料规格\\=${params[9]}&物料型号=${params[10]}` + } + }) +} diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js index b7bb4a4f..5c7cf3b6 100644 --- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js +++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js @@ -1,5 +1,17 @@ import request from '@/utils/request' +// 外购备料出库 +export function change3(Number, code, num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_自家备料到货更改', + param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num + } + }) +} // 查询零件 export function searchtable(num1, num2, num3, pageCurrent, pageSize) { return request({ diff --git a/src/api/ManufacturingCenter/SparePartsOut.js b/src/api/ManufacturingCenter/SparePartsOut.js new file mode 100644 index 00000000..b7bb4a4f --- /dev/null +++ b/src/api/ManufacturingCenter/SparePartsOut.js @@ -0,0 +1,88 @@ +import request from '@/utils/request' + +// 查询零件 +export function searchtable(num1, num2, num3, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_备料到货查询', + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料到货_check=' + num3, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询零件工艺 +export function searchtable2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_备料打印_查询工序信息', + param: '工艺计划流水号=' + num1 + } + }) +} +// 完成备料工序 +export function handlechange(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工作者', + param: '工序流水号=' + Number + '&工作者考勤编号=' + code + } + }) +} +// 查询外购备料零件 +export function searchtable3(num, num1, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_外购备料查询', + param: '零件图号_check=' + num + '&零件图号=' + num1, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 自家备料出库 +export function change(Number, code, num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_备料到货_状态更改', + param: '工艺计划流水号=' + Number + '&重量=' + code + '&单价=' + num + } + }) +} +// 外购备料出库 +export function change2(Number, code, num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_外购备料到货更改', + param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num + } + }) +} +export function handlechange2(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_修改实际完成时间', + param: '工序流水号=' + Number + '&实际完成时间=' + code + } + }) +} + diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index 198c845e..8504236a 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -1,5 +1,32 @@ import request from '@/utils/request' +// 查询原材料库存 +export function searchRawMaterial(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_原材料库存管理_查询', + param: '原材料名称=' + num, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 增加采购计划明细 +export function addMateriel2(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划明细_增加数据2', + param: `采购计划流水号=${num1}&原材料流水号组=${num2}` + } + }) +} +// ////////////////////////////////////////////////////////////////////////////////0529新加↑ + // 查询外购备料列表 export function initPartDrawing(check1, name) { return request({ diff --git a/src/views/ManufacturingCenter/CreateIntakeList/index.vue b/src/views/ManufacturingCenter/CreateIntakeList/index.vue new file mode 100644 index 00000000..b82b79d0 --- /dev/null +++ b/src/views/ManufacturingCenter/CreateIntakeList/index.vue @@ -0,0 +1,1139 @@ + + + + + diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index e82f8c4a..9a07d8e0 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -5,14 +5,13 @@ 零件图号: 查询 - - - + 自家备料确认 - + + - - - - - - - - -
零件图号: 查询 - 外购备料出库 + 外购备料确认 - + + + diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 2715c39b..59f2d570 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -1,75 +1,69 @@ - - - -