From 2851197af53f8236ff6cbfd86956e8c980f111e0 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 20 Mar 2023 19:22:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E7=BB=91=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/pdm/rest/DeviceController.java |  8 +++++++
 .../org/nl/wms/pdm/service/DeviceService.java |  6 +++++
 .../pdm/service/impl/DeviceServiceImpl.java   |  6 +++++
 mes/qd/src/api/wms/pdm/device.js              |  8 ++++++-
 mes/qd/src/views/wms/sch/point/ViewDialog.vue | 24 +++++++++----------
 mes/qd/src/views/wms/sch/point/index.vue      | 21 ++++++++++++++++
 6 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java
index a1caccf4..c327759e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java
@@ -73,4 +73,12 @@ public class DeviceController {
         return new ResponseEntity<>(deviceService.getWorkprocedure(),HttpStatus.OK);
     }
 
+    @GetMapping("/getDeviceList")
+    @Log("设备下拉框")
+    @ApiOperation("设备下拉框")
+    //@PreAuthorize("@el.check('device:list')")
+    public ResponseEntity<Object> getDeviceList(){
+        return new ResponseEntity<>(deviceService.getDeviceList(),HttpStatus.OK);
+    }
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java
index d7af9ce9..d19deb7c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java
@@ -69,4 +69,10 @@ public interface DeviceService {
      * @return
      */
     JSONArray getWorkprocedure();
+
+    /**
+     * 获取设备下拉框
+     * @return
+     */
+    JSONArray getDeviceList();
 }
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 1dc1ec67..5e12f3f4 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
@@ -144,4 +144,10 @@ public class DeviceServiceImpl implements DeviceService {
         return resultJSONArray;
     }
 
+    @Override
+    public JSONArray getDeviceList() {
+        WQLObject wo = WQLObject.getWQLObject("PDM_BI_Device");
+        return wo.query("is_delete = '0'", "device_code").getResultJSONArray(0);
+    }
+
 }
diff --git a/mes/qd/src/api/wms/pdm/device.js b/mes/qd/src/api/wms/pdm/device.js
index e6d2c2ae..9e60b5e8 100644
--- a/mes/qd/src/api/wms/pdm/device.js
+++ b/mes/qd/src/api/wms/pdm/device.js
@@ -30,6 +30,12 @@ export function getWorkprocedure() {
     method: 'get'
   })
 }
+export function getDeviceList() {
+  return request({
+    url: 'api/device/getDeviceList',
+    method: 'get'
+  })
+}
 
 export function getItemByDevice(data) {
   return request({
@@ -62,4 +68,4 @@ export function queryById(device_id) {
   })
 }
 
-export default { add, edit, del, getWorkprocedure, getItemByDevice, savaDeviceItem, copyAdd, queryById }
+export default { add, edit, del, getWorkprocedure, getItemByDevice, savaDeviceItem, copyAdd, queryById, getDeviceList }
diff --git a/mes/qd/src/views/wms/sch/point/ViewDialog.vue b/mes/qd/src/views/wms/sch/point/ViewDialog.vue
index 7b4c2be8..9b8492cb 100644
--- a/mes/qd/src/views/wms/sch/point/ViewDialog.vue
+++ b/mes/qd/src/views/wms/sch/point/ViewDialog.vue
@@ -69,18 +69,18 @@
         <el-form-item label="物料批次">
           <el-input v-model="form.pcsn" style="width: 200px;"/>
         </el-form-item>
-        <el-form-item label="库存量">
-          <el-input v-model="form.ivt_qty" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="入库时间">
-          <el-input v-model="form.instorage_time" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="静置时间(分)">
-          <el-input v-model="form.standing_time" style="width: 200px;"/>
-        </el-form-item>
+<!--        <el-form-item label="库存量">-->
+<!--          <el-input v-model="form.ivt_qty" style="width: 200px;"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="计量单位">-->
+<!--          <el-input v-model="form.point_status_name" style="width: 200px;"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="入库时间">-->
+<!--          <el-input v-model="form.instorage_time" style="width: 200px;"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="静置时间(分)">-->
+<!--          <el-input v-model="form.standing_time" style="width: 200px;"/>-->
+<!--        </el-form-item>-->
       </el-form>
     </el-card>
 
diff --git a/mes/qd/src/views/wms/sch/point/index.vue b/mes/qd/src/views/wms/sch/point/index.vue
index 0920084a..26caa975 100644
--- a/mes/qd/src/views/wms/sch/point/index.vue
+++ b/mes/qd/src/views/wms/sch/point/index.vue
@@ -267,9 +267,25 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="绑定设备" prop="device_code">
+            <el-select
+              clearable
+              filterable
+              v-model="form.device_code"
+              placeholder="请选择"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="点位位置" prop="point_location">
             <el-select
               v-model="form.point_location"
+              clearable
               size="mini"
               placeholder="点位位置"
               class="filter-item"
@@ -427,6 +443,7 @@
 </template>
 
 <script>
+import crudDevice from '@/api/wms/pdm/device'
 import crudRegion from '@/api/wms/sch/region'
 import crudPoint, { changeActive } from '@/api/wms/sch/point'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
@@ -514,6 +531,7 @@ export default {
       pointTypesDialogList: [],
       options: [],
       regionList: [],
+      deviceList: [],
       permission: {},
       rules: {
         point_code: [
@@ -548,6 +566,9 @@ export default {
     crudPoint.getRegion().then(res => {
       this.regionList = res
     })
+    crudDevice.getDeviceList().then(res => {
+      this.deviceList = res
+    })
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据