diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/controller/EncodingRulesController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/controller/EncodingRulesController.java
index caab2edeaf217ab9128ddcf22bd4e254b7966103..353a4aa2e050bbd8f42ffc08de191cd55e9f2501 100644
--- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/controller/EncodingRulesController.java
+++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/encodingrules/controller/EncodingRulesController.java
@@ -91,6 +91,9 @@ public class 	EncodingRulesController extends JeecgController<EncodingRules, IEn
 	 @PostMapping(value = "/encodingTags")
 	 public Map<String, String> encodingTags(@RequestBody JSONObject jsonObject) {
 		String str = jsonObject.getString("tags").replace("-","");
+		if (str.length()>20){
+			return null;
+		}
 		 int j = 1;
 		 String newStr = "";
 		 String value = "";
diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/JobManageController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/JobManageController.java
index 76335b61d04f6eff4b254b4d21aa4797c48e8a1c..ccafe2e54235be2a068e92204bed220fbbcea268 100644
--- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/JobManageController.java
+++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/JobManageController.java
@@ -214,14 +214,16 @@ public class JobManageController extends JeecgController<JobManage, IJobManageSe
 
     @PostMapping("/uploadData")
     public Result<?> uploadData(@RequestBody JobManage jobManage){
+        //查询设备状态
+        Map<String, String> toolboxDoorNum = restController.getToolboxDoorNum(jobManage.getCupboardDoor());
+        Parsing.parsingCode(NewKitReader.kitMsg.split(","));
         if (!"1".equalsIgnoreCase(Parsing.resule)){
             return Result.error("箱子不在柜子中，或出现异常，请联系管理员！");
         }
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if (jobManage.getCupboardDoor() != null && !"".equalsIgnoreCase(jobManage.getCupboardDoor())){
             byte cupboardDoor = (byte)Integer.parseInt(jobManage.getCupboardDoor());
-            //查询设备状态
-            Map<String, String> toolboxDoorNum = restController.getToolboxDoorNum(jobManage.getCupboardDoor());
+
             //获取工种名称
             String typeOfWorkName = ofWorkService.getTypeOfWorkName(toolboxDoorNum.get("0" + jobManage.getCupboardDoor()));
             //查询员工工号
diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/controller/ToolAdminController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/controller/ToolAdminController.java
index c3a45ef4c0ebce473811f918b0ceb73c3b5038e2..0c562fb55a424ee51495bcc0c779efd8897b791f 100644
--- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/controller/ToolAdminController.java
+++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/controller/ToolAdminController.java
@@ -62,6 +62,14 @@ public class ToolAdminController extends JeecgController<ToolAdmin, IToolAdminSe
         return Result.OK(pageList);
     }
 
+    @AutoLog(value = "工具管理-列表查询")
+    @ApiOperation(value = "工具管理-列表查询", notes = "工具管理-列表查询")
+    @GetMapping(value = "/listAll")
+    public Result<?> listAll() {
+        List<ToolAdmin> list = toolAdminService.listAll();
+        return Result.OK(list);
+    }
+
     /**
      * 添加
      *
diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java
index 09da14d65dcbefa42a1b663f94b460a8de691dd5..a006663a47d444f076713d83ce15160d04d634c3 100644
--- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java
+++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java
@@ -39,4 +39,7 @@ public interface ToolAdminMapper extends BaseMapper<ToolAdmin> {
      * @date: 2021/6/15 15:37
      */
     Integer saveList(@Param("list") List list,@Param("toolboxNum") String toolboxNum,@Param("username") String username,@Param("createDate") Date createDate);
+
+    @Select("select * from tool_admin")
+    List<ToolAdmin> listAll();
 }
diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java
index c26527c2e458593e21f21670a901502a324b8f12..671193a506457bd66e3feb29ab4e9237bfe40b9f 100644
--- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java
+++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java
@@ -33,4 +33,6 @@ public interface IToolAdminService extends IService<ToolAdmin> {
      * @date: 2021/6/15 15:37
      */
     Integer saveList(List list, String toolboxNum, String username, Date createDate);
+
+    List<ToolAdmin> listAll();
 }
diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java
index 42cf1cc3b230a2bab86919ff12a24611edb93d73..630bf78963fb7eda9600d27bd7ea231d881cdc58 100644
--- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java
@@ -96,4 +96,13 @@ public class ToolAdminServiceImpl extends ServiceImpl<ToolAdminMapper, ToolAdmin
             return 0;
         }
     }
+
+    @Override
+    public List<ToolAdmin> listAll() {
+        try {
+            return toolAdminMapper.listAll();
+        }catch (Exception e){
+            return null;
+        }
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooltoolbox/mapper/xml/ToolToolboxMapper.xml b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooltoolbox/mapper/xml/ToolToolboxMapper.xml
index 849269cbd536a5aa3fd3e55119f6a98b79c54667..8d79e4d54c6d666821e1f7a781f296569f8e80ab 100644
--- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooltoolbox/mapper/xml/ToolToolboxMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooltoolbox/mapper/xml/ToolToolboxMapper.xml
@@ -24,7 +24,7 @@
 
     <select id="getToolName" parameterType="String" resultType="String">
         select
-            tool_admin.tool_name
+            tool_admin.tool_num
         from
             tool_toolbox
         LEFT JOIN