add: 区域编码

lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java

@@ -74,4 +74,12 @@ public class DeviceController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
+    @GetMapping("/getAllRegions")
+    @Log("查询生产设备")
+    @ApiOperation("查询生产设备")
+    //@SaCheckPermission("device:list")
+    public ResponseEntity<Object> getAllRegions(){
+        return new ResponseEntity<>(deviceService.getAllRegions(),HttpStatus.OK);
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java

@@ -1,6 +1,7 @@
 
 package org.nl.wms.pdm.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.pdm.service.dto.DeviceDto;
 import org.springframework.data.domain.Pageable;
@@ -65,4 +66,10 @@ public interface DeviceService {
 
 
     void changeActive(JSONObject json);
+
+    /**
+     * 获取所有区域信息
+     * @return
+     */
+    JSONArray getAllRegions();
 }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java

@@ -51,6 +51,7 @@ public class DeviceDto implements Serializable {
      * 是否启用
      */
     private String is_active;
+    private String region_code;
 
     /**
      * 创建人

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java

@@ -135,4 +135,11 @@ public class DeviceServiceImpl implements DeviceService {
         WQLObject.getWQLObject("PDM_BI_Device").update(json);
     }
 
+    @Override
+    public JSONArray getAllRegions() {
+        WQLObject wo = WQLObject.getWQLObject("SCH_BASE_Region");
+        JSONArray resultJSONArray = wo.query().getResultJSONArray(0);
+        return resultJSONArray;
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql

@@ -42,9 +42,11 @@
 	IF 输入.flag = "1"
 		PAGEQUERY
 			SELECT
-            	device.*
+            	device.*,
+            	region.region_name
             FROM
             	PDM_BI_Device device
+            	LEFT JOIN sch_base_region region ON region.region_code = device.region_code
             WHERE
                 device.is_delete = '0'
 
@@ -55,4 +57,4 @@
 
 			ENDSELECT
 		ENDPAGEQUERY
-	ENDIF
+	ENDIF