点位绑定设备功能

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