点位绑定设备功能

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

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

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

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 }

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-form-item label="库存量">-->
-          <el-input v-model="form.ivt_qty" style="width: 200px;"/>
+<!--          <el-input v-model="form.ivt_qty" style="width: 200px;"/>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="计量单位">
+<!--        <el-form-item label="计量单位">-->
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+<!--          <el-input v-model="form.point_status_name" style="width: 200px;"/>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="入库时间">
+<!--        <el-form-item label="入库时间">-->
-          <el-input v-model="form.instorage_time" style="width: 200px;"/>
+<!--          <el-input v-model="form.instorage_time" style="width: 200px;"/>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="静置时间(分)">
+<!--        <el-form-item label="静置时间(分)">-->
-          <el-input v-model="form.standing_time" style="width: 200px;"/>
+<!--          <el-input v-model="form.standing_time" style="width: 200px;"/>-->
-        </el-form-item>
+<!--        </el-form-item>-->
       </el-form>
     </el-card>
 

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 则代表不获取数据