diff --git a/src/api/ManufacturingCenter/ProductionCapacityBalance.js b/src/api/ManufacturingCenter/ProductionCapacityBalance.js index 4d63337f..f9e29fd9 100644 --- a/src/api/ManufacturingCenter/ProductionCapacityBalance.js +++ b/src/api/ManufacturingCenter/ProductionCapacityBalance.js @@ -127,8 +127,8 @@ export function discharge(a) { method: 'post', data: { type: '2', - name: '车间生产管理工艺_新排产算法_工序应完成时间_平均算法', - param: '工艺计划流水号=' + a + '=int' + name: '车间生产管理_能力平衡_循环执行', + param: '工艺计划流水号组=' + a } }) } diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js new file mode 100644 index 00000000..52ab573a --- /dev/null +++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +export function getProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} +export function getCustomerName() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} +export function getToolNum() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} +export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '项目计划管理_项目总计划_查询数据', + param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&@机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function searchtable2() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} diff --git a/src/icons/svg/ProjectPlanningManagement.svg b/src/icons/svg/ProjectPlanningManagement.svg new file mode 100644 index 00000000..033a4a6b --- /dev/null +++ b/src/icons/svg/ProjectPlanningManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index da432e2d..ae7686dd 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -5,14 +5,11 @@ 查询 清空 + 入库 + - + - - + - - + @@ -188,17 +182,21 @@ export default { }, // 扫描查询 getscantable() { - if (this.partNumber === '') { + if (this.partNumber === '' || this.partNumber === null) { this.$message.error('请输入零件号') } else { this.listLoading = true searchTable(this.partNumber).then(response => { if (response.data.length === 0) { this.listLoading = false - this.$message.warning('无此零件') - } else if (response.data[0].剩余数量 === 0) { - this.$message.warning('该零件已入库完毕') - } else { + this.$message.warning('该零件未加工完成') + } else if (response.data[0].考核状态 === 8) { + this.listLoading = false + this.$message.warning('该零件已入库') + } else if (response.data[0].考核状态 === 9) { + this.listLoading = false + this.$message.warning('该零件已出库') + } else if (response.data[0].考核状态 === 7) { for (let i = 0; i < this.tableData.length; i++) { if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) { this.ace = this.ace + 1 diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index 7e10d279..71ecd628 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -3,7 +3,7 @@ 工位号: - + { + this.MachineValue = this.Machine[0].value }) }, searchTable() { diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 4bc1f9f8..d986a464 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -266,7 +266,7 @@ - + - + diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 0a7a50fc..5e853f2b 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -621,6 +621,7 @@ export default { directives: { elDragDialog }, data() { return { + bianliang1: [], count: 0, 是否扫描: false, dataX1: [], // 图表1横坐标 @@ -1437,19 +1438,15 @@ export default { }, // 虚拟排产 Discharge() { - this.result1 = 0 for (let i = 0; i < this.tableData1.length; i++) { - discharge(this.tableData1[i].工艺计划流水号).then(response => { - this.result1 += parseInt(response.data[0].result) - if (this.result1 === this.tableData1.length) { - this.result1 = 0 - this.total1 = 0 - this.pageSize1 = 10 - this.pageList1 = 1 - this.Selection1() - } - }) + this.bianliang1.push(this.tableData1[i].工艺计划流水号) } + discharge(this.bianliang1).then(response => { + this.total1 = 0 + this.pageSize1 = 10 + this.pageList1 = 1 + this.Selection1() + }) }, // 4.1 确定零件计划 Plan() { diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue new file mode 100644 index 00000000..2518359c --- /dev/null +++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue @@ -0,0 +1,274 @@ + + + + +