From 56f5781ebc60cdc93e7a92000d23651539208b16 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Wed, 11 Dec 2019 17:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inventory/SelfMadePartsWarehouseOut.js | 83 ++++++ src/utils/request.js | 6 +- src/views/Inventory/Inboundscanning/index.vue | 2 +- src/views/Inventory/OutPartSelect/index.vue | 8 +- .../SelfMadePartsWarehouseOut/index.vue | 269 ++++++++++++++++++ src/views/Inventory/StockInquiry/index.vue | 10 +- .../ActualTimeSupplement/index.vue | 6 +- .../MachiningSequenceAdjustment/index.vue | 2 +- .../ProcessingStatusEdit/index.vue | 4 +- .../ProcessingStatusNew/index.vue | 6 +- .../ShopScheduling/index.vue | 2 +- .../PartDrawingMaintenance/index.vue | 8 +- 12 files changed, 379 insertions(+), 27 deletions(-) create mode 100644 src/api/Inventory/SelfMadePartsWarehouseOut.js create mode 100644 src/views/Inventory/SelfMadePartsWarehouseOut/index.vue diff --git a/src/api/Inventory/SelfMadePartsWarehouseOut.js b/src/api/Inventory/SelfMadePartsWarehouseOut.js new file mode 100644 index 00000000..2e43594e --- /dev/null +++ b/src/api/Inventory/SelfMadePartsWarehouseOut.js @@ -0,0 +1,83 @@ +import request from '@/utils/request' + +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_按时间排序' + } + }) +} + +// 查询机床 +export function searchmachine(num, check) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0' + } + }) +} +// 获取组号 +export function searchgroup(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 获取表单 +export function searchdata(entryNameValue_check, entryNameValue, machineToolValue_check, machineToolValue, groupNumberValue_check, groupNumberValue, partNumber_check, partNumber, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '自制件出库_查询数据', + param: '项目流水号_check=' + entryNameValue_check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + machineToolValue_check + '&机床流水号=' + machineToolValue + '&组件流水号_check=' + groupNumberValue_check + '&组件流水号=' + groupNumberValue + '&零件图号_check=' + partNumber_check + '&零件图号=' + partNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 自制件出库 +export function warehousing(processPlanSerialNumber, leader, remarks) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '自制件出库_循环执行_新', + param: '工艺计划流水号组=' + processPlanSerialNumber + '&考勤编号=' + leader + '&出库备注=' + remarks + } + }) +} +export function selectdepartment() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '出库管理_部门查询' + } + }) +} +export function selectleaders(department) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '出库管理_人员查询', + param: '考核部门编号=' + department + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 14923715..b168c85f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.0.110:8002/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.0.110:8002/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index 29201e24..eaceafc5 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -3,7 +3,7 @@ 零件图号 - + 查询 清空 diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue index 83662ae3..24917a10 100644 --- a/src/views/Inventory/OutPartSelect/index.vue +++ b/src/views/Inventory/OutPartSelect/index.vue @@ -2,7 +2,7 @@
机床号: - + 组号: - + 零件图号: - + 查询 @@ -62,7 +62,7 @@ diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue new file mode 100644 index 00000000..3f16611e --- /dev/null +++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index c8b92807..86e7c636 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -2,7 +2,7 @@
机床号: - + 组号: - + 零件图号: - + 查询 @@ -121,9 +121,9 @@ {{ scope.row.组号 }} - + diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index aa250568..8b1aecfe 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -37,11 +37,11 @@ 操作者: - + 零件图号: - + 工艺名称: - + 查询 新增 diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index 26528d60..0b272612 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -3,7 +3,7 @@ 工位号: - + 机床号: - + 零件号: - + 查询 diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index dd7449c7..f533c4ac 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -2,7 +2,7 @@
补录完成日期 - + {{ item.value2 }}
 - + - + 查询 diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index 50014045..881b4e8f 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -4,7 +4,7 @@ - + 项目名称 - + 机床图号 - + 组号 - + - +