diff --git a/src/api/ManufacturingCenter/ProjectPlanningQuery.js b/src/api/ManufacturingCenter/ProjectPlanningQuery.js new file mode 100644 index 00000000..4007b0b0 --- /dev/null +++ b/src/api/ManufacturingCenter/ProjectPlanningQuery.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +// 初始化 项目名称 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_按时间排序' + } + }) +} +// 查询机床 +export function initMachine(projectNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据2', + param: `项目流水号=${projectNum}` + } + }) +} +// 查询总计划 +export function searchtable(projectNum, machineValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '项目计划管理_项目总计划_查询数据', + param: '项目流水号_check=1&项目流水号=' + projectNum + '&机床流水号_check=1&机床流水号=' + machineValue + } + }) +} +// 查询分计划 +export function searchtable2(machineValue, type) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '项目计划管理_项目详细计划_查询数据', + param: '机床流水号=' + machineValue + '&计划类型=' + type + } + }) +} diff --git a/src/api/PurchasingCenter/BacklogGoodsAnalysis.js b/src/api/PurchasingCenter/BacklogGoodsAnalysis.js new file mode 100644 index 00000000..b0e934a8 --- /dev/null +++ b/src/api/PurchasingCenter/BacklogGoodsAnalysis.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +// 查询库存量 +export function searchMaterialNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_物料与货位对照_查询数据', + param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询滞货库存量 +export function searchBacklogNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_滞货物料与货位对照_查询数据', + param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 转为滞货 +export function submitTurn(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_转为滞货', + param: `物料流水号=${params[0]}&转滞货数量=${params[1]}&物料与货位对照流水号=${params[2]}&货位流水号=${params[3]}` + } + }) +} diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index f1c797f6..874ed6f9 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -1,27 +1,27 @@ import request from '@/utils/request' // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, check1, num1, check2, num2, person) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, person) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料_分配后', - param: `询价状态编号_check=${check1}&询价状态编号=${num1}&物料名称_check=${check2}&物料名称=${num2}&人员编号=${person}`, + param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&人员编号=${person}`, Pagination: pageCurrent + '&' + pageSize } }) } // 查询分配后的基本件 -export function searchPart(pageCurrent, pageSize, check1, num1, person) { +export function searchPart(pageCurrent, pageSize, num1, person) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后', - param: `询价状态编号_check=${check1}&询价状态编号=${num1}&人员编号=${person}`, + param: `物料状态编号=${num1}&人员编号=${person}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -183,3 +183,27 @@ export function saveOrder(num1, num2, num3) { } }) } +// 使用滞货 +export function submitUseInventory(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_使用滞货', + param: `物料流水号=${params[0]}&使用滞货数量=${params[1]}&组件零件流水号=${params[2]}` + } + }) +} +// 取消使用滞货 +export function cancelUseInventory(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_取消使用滞货', + param: `物料流水号=${params[0]}&取消数量=${params[1]}&组件零件流水号=${params[2]}` + } + }) +} diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/api/TechnologyCenter/CreatePackingList.js index b436f4cc..364a014c 100644 --- a/src/api/TechnologyCenter/CreatePackingList.js +++ b/src/api/TechnologyCenter/CreatePackingList.js @@ -117,6 +117,30 @@ export function getGroupData(machine) { }) } +export function editGroupData(num, num1, num2, num3, num4, num5) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: 'PDM_装箱单_部件_编辑数据', + param: `部件编号=${num}&代号=${num1}&名称=${num2}&规格=${num3}&数量=${num4}&备注=${num5}` + } + }) +} + +export function deleteGroupData(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: 'PDM_装箱单_部件_删除数据', + param: `部件编号=${num}` + } + }) +} + export function machineSelect(projectValue) { return request({ url: '', @@ -177,14 +201,14 @@ export function addFileData(name, number, remark, num) { }) } -export function getSpareData(num) { +export function getSpareData(num, num1) { return request({ url: '', method: 'post', data: { type: '1', name: 'PDM_装箱单_备件_查询数据', - param: `项目流水号=${num}&机床流水号=${num}` + param: `项目流水号=${num}&机床流水号=${num1}` } }) } diff --git a/src/icons/svg/BacklogGoodsAnalysis.svg b/src/icons/svg/BacklogGoodsAnalysis.svg new file mode 100644 index 00000000..7302de17 --- /dev/null +++ b/src/icons/svg/BacklogGoodsAnalysis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue new file mode 100644 index 00000000..9f706899 --- /dev/null +++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue @@ -0,0 +1,376 @@ + + + + + + diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue new file mode 100644 index 00000000..30f456fc --- /dev/null +++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 5ffdedab..78e6c59e 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -3,14 +3,8 @@ - 询价状态: - - - + 物料状态: + 物料名称: 物料变更 - + - - - + + + + + - - - - + + + + - + + + + + + + + + + + + +