fix: 分切业务区域校验

lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java

@@ -59,6 +59,7 @@ public class AcsTaskDto {
      * 扩展参数
      */
     private String params;
+    private String params2;
     /**
      * 温度
      */
@@ -109,7 +110,11 @@ public class AcsTaskDto {
      * 任务扩展字段
      */
     private String interaction_json;
+    /**
+     * 空点位
+     */
+    private String empty_site;
 
 
 
-}
+}

lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java

@@ -22,7 +22,6 @@ import java.util.Map;
  **/
 @RestController
 @RequiredArgsConstructor
-
 @RequestMapping("/api/task")
 @Slf4j
 public class TaskController {
@@ -31,15 +30,12 @@ public class TaskController {
 
     @GetMapping
     @Log("查询任务")
-
-    //@SaCheckPermission("task:list")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK);
     }
 
     @GetMapping("/taskStatus")
     @Log("获取任务状态列表")
-
     public ResponseEntity<Object> getTaskStatus() {
         TaskStatusEnum[] values = TaskStatusEnum.values();
         JSONArray arr = new JSONArray();
@@ -59,7 +55,6 @@ public class TaskController {
 
     @GetMapping("/finishType")
     @Log("获取任务类型列表")
-
     public ResponseEntity<Object> getFinishType() {
         FinishTypeEnum[] values = FinishTypeEnum.values();
         JSONArray arr = new JSONArray();
@@ -74,8 +69,6 @@ public class TaskController {
 
     @PutMapping("/operation")
     @Log("任务操作")
-
-    //@SaCheckPermission("task:edit")
     public ResponseEntity<Object> update(@RequestBody Map<String, Object> map) {
         taskService.operation(map);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java

@@ -99,7 +99,7 @@ public class TaskServiceImpl implements TaskService {
         UserAreaServiceImpl userAreaService = new UserAreaServiceImpl();
         String in_area_id = userAreaService.getInArea();
         if (ObjectUtil.isNotEmpty(in_area_id)) {
-            map.put("in_area_id", in_area_id);
+//            map.put("in_area_id", in_area_id);
         }
         JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
         JSONArray content = json.getJSONArray("content");