diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java
index 22a1f390..0b728beb 100644
--- a/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java
+++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentInfoController.java
@@ -105,7 +105,7 @@ public class EquipmentInfoController {
     public R equipmentInfoEdit(@RequestBody EquipmentInfoReq req) throws Exception {
         EquipmentInfo equipmentInfo = equipmentInfoService.selectEquipmentInfoById(req.getId());
         BeanUtils.copyProperty(equipmentInfo, req, true);
-        /*Long typeId = NumberUtil.objToLongDefault(equipmentInfo.getType(), 0);
+        /*Long typeId = NumberUtil.objToLongDefault(equipmentInfo.getType(), 0);//20200921注释掉，后台不支持修改类型，品牌等，只能修改备注，时间，金额
         EquipmentType type = equipmentTypeService.selectEquipmentTypeById(typeId);
         equipmentInfo.setType(type.getType());
 
diff --git a/src/main/java/com/lz/modules/equipment/controller/OneCodeController.java b/src/main/java/com/lz/modules/equipment/controller/OneCodeController.java
index c055a921..8a3e0857 100644
--- a/src/main/java/com/lz/modules/equipment/controller/OneCodeController.java
+++ b/src/main/java/com/lz/modules/equipment/controller/OneCodeController.java
@@ -1,9 +1,11 @@
 package com.lz.modules.equipment.controller;
 
 
+import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
 import com.lz.common.utils.StringUtil;
 import com.lz.modules.equipment.entity.OneCode;
+import com.lz.modules.equipment.entity.OneCodeReq;
 import com.lz.modules.equipment.service.OneCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,6 +26,17 @@ public class OneCodeController {
 
 
 
+    /**
+     * 获取code编码，
+     * */
+    @RequestMapping("/get/getPrints")
+    public R getPrints(@RequestBody OneCodeReq req) {
+
+        PageUtils pageUtils = oneCodeService.selectByReq(req);
+
+        return R.ok().put("codes", pageUtils);
+    }
+
     /**
      * 批量生成指定数量编码，
      * */
diff --git a/src/main/java/com/lz/modules/equipment/dao/OneCodeMapper.java b/src/main/java/com/lz/modules/equipment/dao/OneCodeMapper.java
index 88e26a2f..910d6907 100644
--- a/src/main/java/com/lz/modules/equipment/dao/OneCodeMapper.java
+++ b/src/main/java/com/lz/modules/equipment/dao/OneCodeMapper.java
@@ -8,7 +8,9 @@ package com.lz.modules.equipment.dao;
 * @since 2020-07-29
 */
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lz.modules.equipment.entity.OneCode;
+import com.lz.modules.equipment.entity.OneCodeReq;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,4 +42,6 @@ public interface OneCodeMapper extends BaseMapper<OneCode> {
 	OneCode selectByCode(@Param("code") String code);
 
 	Long updatePrintOneCodes(List<String> codes);
+
+    List selectByCondition(@Param("page") IPage page, @Param("req") OneCodeReq req);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/equipment/entity/OneCodeReq.java b/src/main/java/com/lz/modules/equipment/entity/OneCodeReq.java
new file mode 100644
index 00000000..2d10e6f0
--- /dev/null
+++ b/src/main/java/com/lz/modules/equipment/entity/OneCodeReq.java
@@ -0,0 +1,33 @@
+package com.lz.modules.equipment.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* <p>
+* 菜单权限表
+* </p>*员工表
+* @author quyixiao
+* @since 2020-07-30
+*/
+
+
+@Data
+public class OneCodeReq implements java.io.Serializable {
+  
+    private int page = 1;
+    private int rows = 10;
+    private Long id;
+    //是否删除0未删除，1删除
+    private Integer isDelete;
+    //创建时间
+    private Date gmtCreate;
+    //修改时间
+    private Date gmtModified;
+    //编码
+    private String code;
+    //是否打印 0未打印 1打印
+    private Integer isPrint;
+}
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/equipment/service/OneCodeService.java b/src/main/java/com/lz/modules/equipment/service/OneCodeService.java
index 648d280d..a6e43581 100644
--- a/src/main/java/com/lz/modules/equipment/service/OneCodeService.java
+++ b/src/main/java/com/lz/modules/equipment/service/OneCodeService.java
@@ -2,7 +2,9 @@ package com.lz.modules.equipment.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.lz.common.utils.PageUtils;
 import com.lz.modules.equipment.entity.OneCode;
+import com.lz.modules.equipment.entity.OneCodeReq;
 
 import java.util.List;
 
@@ -40,4 +42,6 @@ public interface OneCodeService extends IService<OneCode> {
 	OneCode selectByCode(String code);
 
 	Long updatePrintOneCodes(List<String> codes);
+
+    PageUtils selectByReq(OneCodeReq req);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/equipment/service/impl/OneCodeServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/OneCodeServiceImpl.java
index 6a6ab70a..c2399aba 100644
--- a/src/main/java/com/lz/modules/equipment/service/impl/OneCodeServiceImpl.java
+++ b/src/main/java/com/lz/modules/equipment/service/impl/OneCodeServiceImpl.java
@@ -1,8 +1,10 @@
 package com.lz.modules.equipment.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lz.common.utils.PageUtils;
 import com.lz.modules.equipment.dao.OneCodeMapper;
 import com.lz.modules.equipment.entity.OneCode;
+import com.lz.modules.equipment.entity.OneCodeReq;
 import com.lz.modules.equipment.service.OneCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -80,4 +82,12 @@ public class OneCodeServiceImpl extends ServiceImpl<OneCodeMapper, OneCode> impl
 		return oneCodeMapper.updatePrintOneCodes(codes);
 	}
 
+	@Override
+	public PageUtils selectByReq(OneCodeReq req){
+		PageUtils pageUtils = PageUtils.startPage(req.getPage(), req.getRows()).doSelect(
+				page -> oneCodeMapper.selectByCondition(page, req)
+		);
+		return pageUtils;
+	}
+
 }
diff --git a/src/main/resources/mapper/equipment/OneCodeMapper.xml b/src/main/resources/mapper/equipment/OneCodeMapper.xml
index f3ebbea1..dd5568cd 100644
--- a/src/main/resources/mapper/equipment/OneCodeMapper.xml
+++ b/src/main/resources/mapper/equipment/OneCodeMapper.xml
@@ -114,5 +114,12 @@
         </foreach>)
     </insert>
 
+    <select id="selectByCondition" resultType="OneCode" >
+        select * from one_code  where is_delete = 0
+        <if test="req.isPrint != null">and isPrint = #{req.isPrint}</if>
+        <if test="req.code != null and req.code != ''">and code like CONCAT('%', #{req.code}, '%') </if>
+        order by id desc
+    </select>
+
 </mapper>