From a91fd23a57d634b6101764419f7f1a1be46b72d6 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 6 Dec 2023 09:45:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E6=9D=90?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/outorder/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue index fff1180..bd37219 100644 --- a/src/views/wms/outorder/index.vue +++ b/src/views/wms/outorder/index.vue @@ -428,7 +428,7 @@ export default { this.queryParams2.orderNo = this.queryParams1.produceCode this.queryParams2.warehouseCode = this.queryParams1.warehouseCode this.queryParams2.orderLines = _this.selectedRows - addPurchaseOrderOutbound(_this.queryParams2).then(response => { + addPurchaseOrderOutbound(JSON.stringify(_this.queryParams2)).then(response => { if (response.data) { this.$modal.msgSuccess("新增成功"); this.open = false; From 41492975e60f97d312cc6e31120625cf1d03a131 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 18 Dec 2023 17:25:39 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=BB=B4=E4=BF=AE-=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E6=8E=AA=E6=96=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/repairOrder/index.vue | 33 ++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 8623238..6e42cae 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -343,6 +343,12 @@ prop="workReason" width="300" /> + + + + + + + + @@ -1423,6 +1442,20 @@ + + + + + + + From f5535b1ee955526b5fc2f5a73ac7401af7da79a9 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Tue, 19 Dec 2023 11:26:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E5=90=84=E7=BB=84?= =?UTF-8?q?=E7=BA=BF=E6=AF=8F=E6=9C=88=E8=AE=BE=E5=A4=87=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/reportWork.js | 14 +++- src/views/dashboard/DeviceChartLine.vue | 101 ++++++++++++++++++++++++ src/views/index.vue | 20 ++++- 3 files changed, 130 insertions(+), 5 deletions(-) create mode 100644 src/views/dashboard/DeviceChartLine.vue diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js index a002262..fb5c5fe 100644 --- a/src/api/mes/reportWork.js +++ b/src/api/mes/reportWork.js @@ -81,6 +81,14 @@ export function getLineChartData() { method: 'get' }); } + +// 获取组线每月设备故障数 +export function getGroupLineEquInfo() { + return request({ + url: '/device/deviceInterface/getGroupLineEquInfo', + method: 'get' + }); +} //查询设备小时表头 export function getHourProductionTitle(query) { return request({ @@ -115,7 +123,7 @@ export function getMesListUser(query) { method: 'get', params: query }); -} +} //查询工单列表 export function getMesListWorkOrder(query) { @@ -124,7 +132,7 @@ export function getMesListWorkOrder(query) { method: 'get', params: query }); -} +} //查询线体列表 export function getMesListEquip(query) { @@ -133,7 +141,7 @@ export function getMesListEquip(query) { method: 'get', params: query }); -} +} //报工按钮 export function reportSap(workorderCode) { const data = { diff --git a/src/views/dashboard/DeviceChartLine.vue b/src/views/dashboard/DeviceChartLine.vue new file mode 100644 index 0000000..7673e57 --- /dev/null +++ b/src/views/dashboard/DeviceChartLine.vue @@ -0,0 +1,101 @@ + + + + + + + diff --git a/src/views/index.vue b/src/views/index.vue index bb0aa0b..dc30c72 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -22,6 +22,12 @@ + + {{deviceTitle}} + + + + @@ -30,10 +36,12 @@ import LineChart from './dashboard/LineChart'; import PieChart from './dashboard/PieChart'; import PieChart2 from './dashboard/PieChart2'; -import {getLineChartData} from '@/api/mes/reportWork' +import {getGroupLineEquInfo, getLineChartData} from '@/api/mes/reportWork' +import DeviceChartLine from "./dashboard/DeviceChartLine"; export default { name: "Index", components: { + DeviceChartLine, LineChart//,PieChart,PieChart2 }, data() { @@ -41,11 +49,14 @@ export default { // 版本号 version: "1.0.0", lineChartData: null, - title:"本月工厂产量" + deviceChartLineData:null, + title:"本月工厂产量", + deviceTitle: "各组线月设备故障数" }; }, created() { this.getLineChartData(); + this.getGroupLineEquInfo(); }, methods: { goTarget(href) { @@ -55,6 +66,11 @@ export default { getLineChartData().then(data => { this.lineChartData = data; }); + }, + getGroupLineEquInfo(){ + getGroupLineEquInfo().then(response => { + this.deviceChartLineData = response.data; + }); } }, }; From 56108932ff1012c34f0cc801d11fb7df2fc98dc5 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 19 Dec 2023 11:30:18 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E6=9D=90?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/outorder.js | 18 ++++++++++++- src/views/wms/order/index.vue | 12 ++++----- src/views/wms/outorder/index.vue | 46 +++++++++++++++++++++----------- 3 files changed, 53 insertions(+), 23 deletions(-) diff --git a/src/api/wms/outorder.js b/src/api/wms/outorder.js index a2c39bc..b814e5a 100644 --- a/src/api/wms/outorder.js +++ b/src/api/wms/outorder.js @@ -25,6 +25,14 @@ export function addOutorder(data) { data: data }); } +// 用于出库任务页面－－查询 +export function getOutorderOUT(data) { + return request({ + url: '/wms/order/PurchaseOrderOutboundPda', + method: 'post', + data: data + }); +} // 修改包材出库单 export function updateOutorder(data) { @@ -65,4 +73,12 @@ export function addPurchaseOrderOutbound(data) { method: 'post', data: data }); -} \ No newline at end of file +} +// 新增 +export function OutboundPostingSAP(data) { + return request({ + url: '/wms/order/OutboundPostingSAP', + method: 'post', + data: data + }); +} diff --git a/src/views/wms/order/index.vue b/src/views/wms/order/index.vue index f9fc299..e924c0e 100644 --- a/src/views/wms/order/index.vue +++ b/src/views/wms/order/index.vue @@ -104,7 +104,7 @@ - + @@ -356,7 +356,7 @@ export default { reset() { this.form = { siteCode: null, - ID: null, + id: null, procureCode: null, materialCode: null, materialDesc: null, @@ -401,7 +401,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.ID) + this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -414,7 +414,7 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); - const ID = row.ID || this.ids + const ID = row.id || this.ids getOrder(ID).then(response => { this.form = response.data; this.open = true; @@ -425,7 +425,7 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - if (this.form.ID != null) { + if (this.form.id != null) { updateOrder(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -443,7 +443,7 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const IDs = row.ID || this.ids; + const IDs = row.id || this.ids; this.$modal.confirm('是否确认删除包材采购单编号为"' + IDs + '"的数据项？').then(function() { return delOrder(IDs); }).then(() => { diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue index bd37219..7b54fff 100644 --- a/src/views/wms/outorder/index.vue +++ b/src/views/wms/outorder/index.vue @@ -26,14 +26,14 @@ 新增 - + + 过账 + + 导出 @@ -135,7 +135,7 @@