From 4709decf4718376fb8984b05cda1ebd3f77bb4d0 Mon Sep 17 00:00:00 2001 From: xs Date: Wed, 18 Sep 2024 09:33:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?3.0.8=20=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=8E=B7=E5=8F=96=E5=86=85=E9=83=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hw/mes/controller/MesBaseMaterialInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java index 2a4b4ef..5893156 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java @@ -138,7 +138,7 @@ public class MesBaseMaterialInfoController extends BaseController * 获取物料信息详细信息 */ @InnerAuth - @GetMapping(value = "/getMaterialByMaterialId/materialId}") + @GetMapping(value = "/getMaterialByMaterialId/{materialId}") public AjaxResult getMaterialByMaterialId(@PathVariable("materialId") Long materialId) { return success(mesBaseMaterialInfoService.selectMesBaseMaterialInfoByMaterialId(materialId)); From 34354defa8cefeefabd176af7ac0cbce92ea8e8e Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 18 Sep 2024 16:54:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?change=20-=204=E3=80=815=E6=A5=BC=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hw-ui/src/views/board/fifthFloor/index.vue | 9 ++++++++- hw-ui/src/views/board/fourthFloor/assemble.vue | 11 +++++++++-- hw-ui/src/views/board/fourthFloor/laserLight.vue | 12 ++++++++++-- hw-ui/src/views/board/fourthFloor/weld.vue | 12 +++++++++++- 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/hw-ui/src/views/board/fifthFloor/index.vue b/hw-ui/src/views/board/fifthFloor/index.vue index c91dac3..688d839 100644 --- a/hw-ui/src/views/board/fifthFloor/index.vue +++ b/hw-ui/src/views/board/fifthFloor/index.vue @@ -488,6 +488,9 @@ +
+ +
@@ -542,6 +545,8 @@ import { getNewestOutstockCabinet,updateBarcodePlan, completeCollectMaterials, completeReturnMaterials,continueRawInstock } from "@/api/board"; import applyRawOutstock from '@//views/board/common/applyRawOutstock.vue'; +import WorkshopNotice from "@/components/workshopNotice/index.vue"; +import {noticeData} from "@/utils/notice" const setState = (e) => { if (e === '1') { @@ -560,7 +565,8 @@ export default { components: { 'apply-raw-outstock': applyRawOutstock, Chart, - PrintPage + PrintPage, + WorkshopNotice }, dicts: ['wms_raw_return_task_type', 'mes_safe_flag'], provide(){ @@ -568,6 +574,7 @@ export default { closeDialog : this.closeDialog } }, + mixins: [noticeData], data() { return { fileList: [], diff --git a/hw-ui/src/views/board/fourthFloor/assemble.vue b/hw-ui/src/views/board/fourthFloor/assemble.vue index bffa995..d1da527 100644 --- a/hw-ui/src/views/board/fourthFloor/assemble.vue +++ b/hw-ui/src/views/board/fourthFloor/assemble.vue @@ -329,6 +329,10 @@ +
+ +
+ @@ -350,6 +354,8 @@ import { import {monitorSerialData} from "@/utils/serial"; import applyRawOutstock from '@//views/board/common/applyRawOutstock.vue'; import {getNowDateTime} from "@/utils/ruoyi"; +import WorkshopNotice from "@/components/workshopNotice/index.vue"; +import {noticeData} from "@/utils/notice" const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100 export default { @@ -360,11 +366,12 @@ export default { closeDialog : this.closeDialog } }, - mixins: [monitorSerialData], + mixins: [monitorSerialData, noticeData], components: { 'apply-raw-outstock': applyRawOutstock, Chart, - PrintPage + PrintPage, + WorkshopNotice }, data() { return { diff --git a/hw-ui/src/views/board/fourthFloor/laserLight.vue b/hw-ui/src/views/board/fourthFloor/laserLight.vue index 6525703..ef0637e 100644 --- a/hw-ui/src/views/board/fourthFloor/laserLight.vue +++ b/hw-ui/src/views/board/fourthFloor/laserLight.vue @@ -233,6 +233,11 @@ 确 定 + +
+ +
+ @@ -254,6 +259,8 @@ import { import {monitorSerialData} from "@/utils/serial" import {addWmslocation, updateWmslocation} from "@/api/wms/wmslocation"; +import WorkshopNotice from "@/components/workshopNotice/index.vue"; +import {noticeData} from "@/utils/notice" const setState = (e) => { if (e === '1') { @@ -269,9 +276,10 @@ const setState = (e) => { const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100 export default { name: 'Board1', - mixins: [monitorSerialData], + mixins: [monitorSerialData, noticeData], components: { - Chart + Chart, + WorkshopNotice }, data() { return { diff --git a/hw-ui/src/views/board/fourthFloor/weld.vue b/hw-ui/src/views/board/fourthFloor/weld.vue index 674d447..e42721b 100644 --- a/hw-ui/src/views/board/fourthFloor/weld.vue +++ b/hw-ui/src/views/board/fourthFloor/weld.vue @@ -220,6 +220,11 @@ style="display: block; max-width: 100%; margin: 0 auto" /> + +
+ +
+ @@ -232,6 +237,9 @@ import { getProductPlans, startNextProductPlanDetail } from '@/api/board' +import WorkshopNotice from "@/components/workshopNotice/index.vue"; +import {noticeData} from "@/utils/notice" +import {monitorSerialData} from "@/utils/serial"; const setState = (e) => { if (e === '1') { @@ -248,8 +256,10 @@ const vw = (document.documentElement.clientWidth || document.body.clientWidth) / export default { name: 'Board1', components: { - Chart + Chart, + WorkshopNotice }, + mixins: [noticeData], data() { return { fileList: [],