From 23e14f196eaf5514d5aa2d76aa91d8adbbeb236d Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 22 Sep 2022 18:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sb/repair/wql/EM_BI_DEVICEREPAIR001.wql   |  4 +--
 .../upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql  |  2 +-
 .../views/wms/basedata/em/devicebom/index.vue | 25 +++++++++++++++++--
 .../wms/sb/repair/devicerepairpa/index.vue    | 24 +++++++++++++++++-
 .../wms/sb/repair/devicerepaorout/index.vue   |  4 +--
 5 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
index 378d3329..304d224c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
@@ -281,7 +281,7 @@
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.invstatus not in ('01')
+                AND mst.invstatus not in ('01','04')
 
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
@@ -336,7 +336,7 @@
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.invstatus in ('03','04','05')
+                AND mst.invstatus in ('04')
 
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
index ca49d411..209e97c5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
@@ -115,7 +115,7 @@
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.invstatus in ('07','99')
+                AND mst.invstatus in ('05','99')
 
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
diff --git a/mes/qd/src/views/wms/basedata/em/devicebom/index.vue b/mes/qd/src/views/wms/basedata/em/devicebom/index.vue
index c4119950..67109ca4 100644
--- a/mes/qd/src/views/wms/basedata/em/devicebom/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/devicebom/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading.fullscreen.lock="fullscreenLoading">
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
@@ -51,7 +51,18 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          @click="synchronize"
+        >
+          同步物料编码
+        </el-button>
+      </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
@@ -125,6 +136,7 @@ export default {
   },
   data() {
     return {
+      fullscreenLoading: false,
       classes: [],
       class_idStr: null,
       materOpt_code: '23',
@@ -200,6 +212,15 @@ export default {
           return obj
         })
       })
+    },
+    synchronize() {
+      this.fullscreenLoading = true
+      crudMaterialbase.synchronize(this.crud.query).then(res => {
+        this.fullscreenLoading = false
+        this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
     }
   }
 }
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
index 3d3ba781..ceb94389 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
@@ -89,6 +89,17 @@
         >
           开始维修
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="execu_flag"
+          @click="outRepair"
+        >
+          委外维修
+        </el-button>
    <!--     <el-button
           slot="right"
           class="filter-item"
@@ -370,6 +381,17 @@ export default {
         this.crud.notify('状态不正确', CRUD.NOTIFICATION_TYPE.INFO)
       }
     },
+    outRepair() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      if (data.invstatus !== '03') {
+        return this.crud.notify('只能对开始状态的单据维修', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicerepairmst.outRepair(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
     mySelectionChange(rows) {
       this.buttonChange(rows)
     },
@@ -386,7 +408,7 @@ export default {
           if ('01,03,04,05,06,07,99'.includes(rows[i].invstatus)) {
             this.start_flag = true
           }
-          if ('01,02,06,07,99'.includes(rows[i].invstatus)) {
+          if ('01,02,04,05,06,07,99'.includes(rows[i].invstatus)) {
             this.execu_flag = true
           }
           if ('01,02,04,06,07,99'.includes(rows[i].invstatus)) {
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
index 8d4e0f14..c4d908bf 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
@@ -78,7 +78,7 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
+ <!--       <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -88,7 +88,7 @@
           @click="outRepair"
         >
           委外维修
-        </el-button>
+        </el-button>-->
         <el-button
           slot="right"
           class="filter-item"