Merge remote-tracking branch 'origin/master'

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));

hw-ui/src/views/board/fifthFloor/index.vue

@@ -488,6 +488,9 @@
       </div>
     </el-dialog>
 
+    <div id="workshopNotice">
+      <WorkshopNotice :visible.sync="showTableDialog" :noticeListData="noticeListData"></WorkshopNotice>
+    </div>
 
     <!--    <el-dialog :visible.sync="assignModel" title="工位选择" width="80%">-->
 
@@ -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: [],

hw-ui/src/views/board/fourthFloor/assemble.vue

@@ -329,6 +329,10 @@
       </el-form>
     </el-dialog>
 
+    <div id="workshopNotice">
+      <WorkshopNotice :visible.sync="showTableDialog" :noticeListData="noticeListData"></WorkshopNotice>
+    </div>
+
   </div>
 </template>
 
@@ -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 {

hw-ui/src/views/board/fourthFloor/laserLight.vue

@@ -233,6 +233,11 @@
         <el-button type="primary" v-loading="submitLoading" @click="submitRawStock">确 定</el-button>
       </div>
     </el-dialog>
+
+    <div id="workshopNotice">
+      <WorkshopNotice :visible.sync="showTableDialog" :noticeListData="noticeListData"></WorkshopNotice>
+    </div>
+
   </div>
 </template>
 
@@ -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 {

hw-ui/src/views/board/fourthFloor/weld.vue

@@ -220,6 +220,11 @@
         style="display: block; max-width: 100%; margin: 0 auto"
       />
     </el-dialog>
+
+    <div id="workshopNotice">
+      <WorkshopNotice :visible.sync="showTableDialog" :noticeListData="noticeListData"></WorkshopNotice>
+    </div>
+
   </div>
 </template>
 
@@ -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: [],