From 5b63a316190f3c00143ff340ed18d66ac4fe583b Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 22 Mar 2023 16:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=BE=E5=A4=87=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pdm/service/impl/DeviceServiceImpl.java   |  4 +-
 .../java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql  |  4 +
 mes/qd/src/views/wms/pdm/device/index.vue     | 80 +++++++++++++------
 3 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
index 91d5ef52..7547baf1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
@@ -41,6 +41,7 @@ public class DeviceServiceImpl implements DeviceService {
         param.put("flag", "1");
         param.put("search", whereJson.get("search"));
         param.put("workprocedure_id", whereJson.get("workprocedure_id"));
+        param.put("product_area", whereJson.get("product_area"));
         JSONObject jsonObject = WQL.getWO("QUERY_DEVICE").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "device_code asc");
         return jsonObject;
     }
@@ -120,8 +121,7 @@ public class DeviceServiceImpl implements DeviceService {
     @Override
     public JSONArray getWorkprocedure() {
         WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure");
-        final JSONArray resultJSONArray = wo.query("is_used = '0'").getResultJSONArray(0);
-        return resultJSONArray;
+        return wo.query("is_used = '1'").getResultJSONArray(0);
     }
 
     @Override
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql
index e16de1df..36777c56 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql
@@ -16,6 +16,7 @@
 	输入.flag					        TYPEAS s_string
 	输入.search  					    TYPEAS s_string
 	输入.workprocedure_id			    TYPEAS s_string
+	输入.product_area   			    TYPEAS s_string
 
 
 [临时表]
@@ -54,6 +55,9 @@
                     ENDOPTION
                     OPTION 输入.workprocedure_id <> ""
                         (device.workprocedure_id = 输入.workprocedure_id)
+                    ENDOPTION
+                    OPTION 输入.product_area <> ""
+                        device.product_area = 输入.product_area
                     ENDOPTION
     			ENDSELECT
     		ENDPAGEQUERY
diff --git a/mes/qd/src/views/wms/pdm/device/index.vue b/mes/qd/src/views/wms/pdm/device/index.vue
index d60641d2..2b35319f 100644
--- a/mes/qd/src/views/wms/pdm/device/index.vue
+++ b/mes/qd/src/views/wms/pdm/device/index.vue
@@ -3,26 +3,51 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">模糊搜索</label>
-        <el-input
-          v-model="query.search"
-          clearable
-          size="small"
-          placeholder="请输入设备编码或名称"
-          style="width: 220px;"
-          class="filter-item"
-        />
-        <label class="el-form-item-label">所属工序</label>
-        <el-select v-model="query.workprocedure_id" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
-          <el-option
-            v-for="item in workList"
-            :key="item.workprocedure_id"
-            :label="item.workprocedure_name"
-            :value="item.workprocedure_id"
-          />
-        </el-select>
-        <rrOperation :crud="crud" />
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="生产区域">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              filterable
+              size="mini"
+              placeholder="区域类型"
+              class="filter-item"
+              @change="crud.toQuery()"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="模糊搜索">
+            <el-input
+              v-model="query.search"
+              clearable
+              size="small"
+              placeholder="请输入设备编码或名称"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item label="所属工序">
+            <el-select v-model="query.workprocedure_id" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
+              <el-option
+                v-for="item in workList"
+                :key="item.workprocedure_id"
+                :label="item.workprocedure_name"
+                :value="item.workprocedure_id"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation :crud="crud" />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -196,9 +221,16 @@ export default {
   name: 'Device',
   components: { pagination, crudOperation, rrOperation, udOperation, DeviceItemDialog, CopyDialog, DeviceInfoDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['is_used', 'IS_OR_NOT'],
+  dicts: ['is_used', 'IS_OR_NOT', 'product_area'],
   cruds() {
-    return CRUD({ title: '生产设备', url: 'api/device', idField: 'device_code', sort: 'device_code,desc',
+    return CRUD({
+      title: '生产设备',
+      url: 'api/device',
+      idField: 'device_code',
+      sort: 'device_code,desc',
+      query: {
+        product_area: 'A1'
+      },
       optShow: {
         add: true,
         edit: false,
@@ -206,7 +238,8 @@ export default {
         reset: true,
         download: false
       },
-      crudMethod: { ...crudDevice }})
+      crudMethod: { ...crudDevice }
+    })
   },
   data() {
     return {
@@ -296,6 +329,7 @@ export default {
     },
     getWorkprocedure() { // 获取工序下拉框
       crudDevice.getWorkprocedure().then(res => {
+        console.log(res)
         this.workList = res
       })
     },