rev 行架任务校验

acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java

@@ -146,7 +146,7 @@ public class AutoCreateInst {
             //判断agv系统
             //1、1楼叉车系统
             //2、2楼1区域AGV系统
-            //3、2楼2区域AGV系统
+            //3、2楼2区域AGV系统 -已废弃
             if (!StrUtil.equals(agv_system_type, "1")) {
                 // task_type
                 //1、生箔； Itype=1:取空，取满，放空，放满；
@@ -164,11 +164,13 @@ public class AutoCreateInst {
                     instdto.setAgv_inst_type("3");
                 } else if (StrUtil.equals(task_type, "8")) {
                     instdto.setAgv_inst_type("2");
+                } else {
+                    log.info("未找到对应的AGV指令类型，任务号:" + acsTask.getTask_code() + ",task_type:" + acsTask.getTask_type()) ;
+                    continue;
                 }
             } else {
                 instdto.setAgv_inst_type("4");
             }
-
             try {
                 instructionService.create(instdto);
             } catch (Exception e) {

acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java

@@ -56,14 +56,14 @@ public class DictController {
 
     @ApiOperation("查询字典")
     @GetMapping(value = "/all")
-    @SaCheckPermission("dict:list")
+//    @SaCheckPermission("dict:list")
     public ResponseEntity<Object> queryAll(){
         return new ResponseEntity<>(dictService.queryAll(new DictQueryCriteria()),HttpStatus.OK);
     }
 
     @ApiOperation("查询字典")
     @GetMapping
-    @SaCheckPermission("dict:list")
+//    @SaCheckPermission("dict:list")
     public ResponseEntity<Object> query(DictQueryCriteria resources, Pageable pageable){
         return new ResponseEntity<>(dictService.queryAll(resources,pageable),HttpStatus.OK);
     }