From 750a4edcc710fbcff6806a6e4195b7bfe87e1c62 Mon Sep 17 00:00:00 2001 From: liushuai Date: Fri, 21 Jun 2019 09:31:46 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartWorkCraftSelect_rdlc.js | 4 +- src/api/Outsourcing/OutsourcingTaskQuery.js | 8 +- .../PartWorkCraftSelect_rdlc/index.vue | 22 +- .../ProcessQuotaEstablishment/index.vue | 6 +- .../OutsourcingTaskQuery/index.vue | 728 +++--------------- 5 files changed, 122 insertions(+), 646 deletions(-) diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js index 3f8f6066..76649a97 100644 --- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js +++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js @@ -78,8 +78,8 @@ export function returnEdit(num) { method: 'post', data: { type: '2', - name: '车间生产管理工艺_在制零件工艺调整_修改工艺', - param: '工艺计划流水号=' + num + name: '车间生产管理工艺_在制零件工艺调整_修改工艺_循环', + param: `工艺计划流水号组=${num}` } }) } diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js index d59d251b..ac006459 100644 --- a/src/api/Outsourcing/OutsourcingTaskQuery.js +++ b/src/api/Outsourcing/OutsourcingTaskQuery.js @@ -155,15 +155,15 @@ export function deleteData1(Number) { } }) } -// 选入零件 -export function insertParts(processNum, Number) { +// 零件到货 +export function Arrival(Number) { return request({ url: '', method: 'post', data: { type: '2', - name: '车间生产管理_外协加工任务单明细_增加数据', - param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int' + name: '车间生产管理_外协零件_到货', + param: `外协加工任务单明细流水号组=${Number}` } }) } diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 8a3308e0..4fa43c68 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -50,7 +50,12 @@ height="550" border highlight-current-row + @selection-change="handleSelectionChange" @row-click="click"> + From c36ebf051f6069c375110a9b5f2993c8b8687479 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 21 Jun 2019 12:46:22 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=BE=85=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/index.vue | 55 ++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 37eed699..707ff73a 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -9,16 +9,26 @@ {{ sudoku.name }} - -
- - - - +
+ 待分配零件数 + + + + +
+ {{ machine.机床图号 }} +
+ + + + + + +
@@ -35,7 +45,9 @@ export default { sudokus: [], curSelect: null, number: '', - timer: '' + timer: '', + timer2: '', + machines: [] } }, computed: { @@ -47,11 +59,18 @@ export default { mounted() { this.getFileList() this.timer = setInterval(this.getFileList, 60 * 60 * 1000) // 60 分钟一刷新 + this.searchUnallocatePartNumber() + this.timer2 = setInterval(this.searchUnallocatePartNumber, 20 * 60 * 1000) // 20 分钟一刷新 }, beforeDestroy() { clearInterval(this.timer) + clearInterval(this.timer2) }, methods: { + // 选择机床 + clickCard() { + this.$router.push({ path: '/PurchaseTaskAllocate/index' }) + }, async getFileList() { await request({ url: '', @@ -85,6 +104,28 @@ export default { value: res.data[0].Column1 }) }) + }, + async searchUnallocatePartNumber() { + this.machines = [] + await request({ + url: '', + method: 'post', + data: { + type: '3', + name: ` select 项目流水号,机床流水号,机床图号,sum(未分配零件数) as 未分配零件数 from ( + select 项目流水号,机床流水号,机床图号,COUNT(*) as 未分配零件数 from MRP_计划订单_组件零件清单_标准件和外购件_视图 + where 人员编号 is null + group by 项目流水号,机床流水号,机床图号 + union all + select 项目流水号,机床流水号,机床图号,COUNT(*) as 未分配零件数 from MRP_计划订单_组件零件清单_基本件_视图 + where 人员编号 is null + group by 项目流水号,机床流水号,机床图号 + ) as tb1 + group by 项目流水号,机床流水号,机床图号` + } + }).then(res => { + this.machines = res.data + }) } } } From 84b3e6ca9a5636989c80214bda627397d56508dd Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 21 Jun 2019 14:43:51 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=B4=A8=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Outsourcing/OutsourcingQCSearch.js | 15 +- .../Outsourcing/OutsourcingQCSearch/index.vue | 174 ++++++++++++++---- 2 files changed, 152 insertions(+), 37 deletions(-) diff --git a/src/api/Outsourcing/OutsourcingQCSearch.js b/src/api/Outsourcing/OutsourcingQCSearch.js index cd3a4590..b4dace89 100644 --- a/src/api/Outsourcing/OutsourcingQCSearch.js +++ b/src/api/Outsourcing/OutsourcingQCSearch.js @@ -21,8 +21,19 @@ export function searchTable2(...params) { data: { type: '1', name: '车间生产管理_外协到货单明细_查询数据', - param: `外协到货单流水号=${params[2]}`, - Pagination: params[0] + '&' + params[1] + param: `外协到货单流水号=${params[0]}` + } + }) +} +// 查询外协到货单明细 +export function searchTableDetail(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '质检管理_外协质检数据_查询数据', + param: `检测类型=${params[0]}&外协到货单明细流水号=${params[1]}` } }) } diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue index b5b97528..a0da4aa5 100644 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue @@ -33,9 +33,9 @@ @size-change="handleSizeChange1" @current-change="handleCurrentChange1"/> - + - + @@ -45,17 +45,17 @@ {{ scope.row.零件图号 }} - + - + - + @@ -65,39 +65,88 @@ {{ scope.row.检验时间 || '—' }} - + - + - + -
- -
From 21e994d9d7ac84a70b18a8a8b71e8b1feebd5edd Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 21 Jun 2019 15:02:17 +0800 Subject: [PATCH 07/10] fixed bug --- src/views/Outsourcing/OutsourcingQCSearch/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue index f91f83be..2bb437b5 100644 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue @@ -1,7 +1,7 @@