统一修改箱码幅面模块的命名

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/BoxCodeFormatController.java

@@ -1,14 +1,14 @@
 package com.abi.qms.platform.controller.console;
 
-import com.abi.qms.platform.dto.req.BoxCodeFormatDetailReq;
+import com.abi.qms.platform.dto.req.QrBoxCodeFormatDetailReq;
 import com.abi.qms.platform.dto.req.DeleteBoxCodeFormatreq;
 import com.abi.qms.platform.dto.req.DisableBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.EnableBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.ListBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.SaveBoxCodeFormatReq;
-import com.abi.qms.platform.dto.res.BoxCodeFormatDetailRes;
+import com.abi.qms.platform.dto.res.QrBoxCodeFormatDetailRes;
 import com.abi.qms.platform.dto.res.ListBoxCodeFormatRes;
-import com.abi.qms.platform.service.BoxCodeFormatService;
+import com.abi.qms.platform.service.QrBoxCodeFormatService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,17 +31,17 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("boxCodeFormat")
 @Api(tags = "箱码幅面管理")
-public class BoxCodeFormatController {
+public class QrBoxCodeFormatController {
 
     @Autowired
-    private BoxCodeFormatService boxCodeFormatService;
+    private QrBoxCodeFormatService qrBoxCodeFormatService;
 
 
     @ApiOperation("箱码幅面新增/修改")
     @PostMapping("saveBoxCodeFormat")
     public BaseResponse saveBoxCodeFormat(@Validated @RequestBody SaveBoxCodeFormatReq saveBoxCodeFormatReq) {
         //箱码幅面新增修改
-        boxCodeFormatService.saveBoxCodeFormat(saveBoxCodeFormatReq);
+        qrBoxCodeFormatService.saveBoxCodeFormat(saveBoxCodeFormatReq);
         //包装出参
         return BaseResponse.create();
     }
@@ -50,16 +50,16 @@ public class BoxCodeFormatController {
     @GetMapping("listBoxCodeFormat")
     public BaseResponse<ListBoxCodeFormatRes> listBoxCodeFormat(@Validated ListBoxCodeFormatReq listBoxCodeFormatReq) {
         //箱码幅面查询分页
-        ListBoxCodeFormatRes result = boxCodeFormatService.listBoxCodeFormat(listBoxCodeFormatReq);
+        ListBoxCodeFormatRes result = qrBoxCodeFormatService.listBoxCodeFormat(listBoxCodeFormatReq);
         //包装出参
         return BaseResponse.create(result);
     }
 
     @ApiOperation("箱码幅面查询详情")
     @GetMapping("getBoxCodeFormatDetail")
-    public BaseResponse<BoxCodeFormatDetailRes> getBoxCodeFormatDetail(@Validated BoxCodeFormatDetailReq boxCodeFormatDetailReq) {
+    public BaseResponse<QrBoxCodeFormatDetailRes> getBoxCodeFormatDetail(@Validated QrBoxCodeFormatDetailReq qrBoxCodeFormatDetailReq) {
         //箱码幅面查询详情
-        BoxCodeFormatDetailRes result = boxCodeFormatService.getBoxCodeFormatDetail(boxCodeFormatDetailReq);
+        QrBoxCodeFormatDetailRes result = qrBoxCodeFormatService.getBoxCodeFormatDetail(qrBoxCodeFormatDetailReq);
         //包装出参
         return BaseResponse.create(result);
     }
@@ -68,7 +68,7 @@ public class BoxCodeFormatController {
     @PostMapping("enableBoxCodeFormat")
     public BaseResponse enableBoxCodeFormat(@Validated @RequestBody EnableBoxCodeFormatReq enableBoxCodeFormatReq) throws Exception {
         //箱码幅面启用
-        boxCodeFormatService.enableBoxCodeFormat(enableBoxCodeFormatReq);
+        qrBoxCodeFormatService.enableBoxCodeFormat(enableBoxCodeFormatReq);
         //包装出参
         return BaseResponse.create();
     }
@@ -77,7 +77,7 @@ public class BoxCodeFormatController {
     @PostMapping("disableBoxCodeFormat")
     public BaseResponse disableBoxCodeFormat(@Validated @RequestBody DisableBoxCodeFormatReq disableBoxCodeFormatReq) throws Exception {
         //箱码幅面禁用
-        boxCodeFormatService.disableBoxCodeFormat(disableBoxCodeFormatReq);
+        qrBoxCodeFormatService.disableBoxCodeFormat(disableBoxCodeFormatReq);
         //包装出参
         return BaseResponse.create();
     }
@@ -86,7 +86,7 @@ public class BoxCodeFormatController {
     @PostMapping("deleteBoxCodeFormat")
     public BaseResponse deleteBoxCodeFormat(@Validated @RequestBody DeleteBoxCodeFormatreq deleteBoxCodeFormatreq) throws Exception {
         //删除箱码幅面
-        boxCodeFormatService.deleteBoxCodeFormat(deleteBoxCodeFormatreq);
+        qrBoxCodeFormatService.deleteBoxCodeFormat(deleteBoxCodeFormatreq);
         //包装出参
         return BaseResponse.create();
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BoxCodeFormat.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "箱码幅面对象", description = "箱码幅面")
-public class BoxCodeFormat {
+public class QrBoxCodeFormat {
 
     @ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.AUTO)

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BoxCodeFormatMapper.java

@@ -1,7 +1,7 @@
 package com.abi.qms.platform.dao.mapper;
 
-import com.abi.qms.platform.dao.entity.BoxCodeFormat;
-import com.abi.qms.platform.dao.vo.result.BoxCodeFormatVO;
+import com.abi.qms.platform.dao.entity.QrBoxCodeFormat;
+import com.abi.qms.platform.dao.vo.result.QrBoxCodeFormatVO;
 import com.abi.qms.platform.dto.req.ListBoxCodeFormatReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @date: 2021/04/20 09:51
  * @description: 箱码幅面mapper接口
  */
-public interface BoxCodeFormatMapper extends BaseMapper<BoxCodeFormat> {
+public interface QrBoxCodeFormatMapper extends BaseMapper<QrBoxCodeFormat> {
 
     /**
      * 分页查询箱码幅面信息
@@ -20,7 +20,7 @@ public interface BoxCodeFormatMapper extends BaseMapper<BoxCodeFormat> {
      * @param page
      * @return
      */
-    IPage<BoxCodeFormatVO> listBoxCodeFormat(IPage page, @Param("param") ListBoxCodeFormatReq param);
+    IPage<QrBoxCodeFormatVO> listBoxCodeFormat(IPage page, @Param("param") ListBoxCodeFormatReq param);
 
     /**
      * 根据ID查询详情信息
@@ -28,5 +28,5 @@ public interface BoxCodeFormatMapper extends BaseMapper<BoxCodeFormat> {
      * @param id
      * @return
      */
-    BoxCodeFormatVO selectBoxCodeFormatDetailById(@Param("id") Long id);
+    QrBoxCodeFormatVO selectBoxCodeFormatDetailById(@Param("id") Long id);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/BoxCodeFormatVO.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @ApiModel
-public class BoxCodeFormatVO implements Serializable {
+public class QrBoxCodeFormatVO implements Serializable {
 
     @ApiModelProperty(value = "id")
     private Long id;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/BoxCodeFormatDetailReq.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @ApiModel
-public class BoxCodeFormatDetailReq implements Serializable {
+public class QrBoxCodeFormatDetailReq implements Serializable {
 
     @NotNull(message = "ID为空")
     @ApiModelProperty(value = "id")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/BoxCodeFormatDetailRes.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @ApiModel
-public class BoxCodeFormatDetailRes implements Serializable {
+public class QrBoxCodeFormatDetailRes implements Serializable {
 
     @ApiModelProperty(value = "id")
     private Long id;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/BoxCodeFormatService.java

@@ -1,12 +1,12 @@
 package com.abi.qms.platform.service;
 
-import com.abi.qms.platform.dto.req.BoxCodeFormatDetailReq;
+import com.abi.qms.platform.dto.req.QrBoxCodeFormatDetailReq;
 import com.abi.qms.platform.dto.req.DeleteBoxCodeFormatreq;
 import com.abi.qms.platform.dto.req.DisableBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.EnableBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.ListBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.SaveBoxCodeFormatReq;
-import com.abi.qms.platform.dto.res.BoxCodeFormatDetailRes;
+import com.abi.qms.platform.dto.res.QrBoxCodeFormatDetailRes;
 import com.abi.qms.platform.dto.res.ListBoxCodeFormatRes;
 
 /**
@@ -14,7 +14,7 @@ import com.abi.qms.platform.dto.res.ListBoxCodeFormatRes;
  * @date: 2021/04/20 09:49
  * @description: 箱码幅面管理
  */
-public interface BoxCodeFormatService {
+public interface QrBoxCodeFormatService {
 
     /**
      * 新增或修改箱码幅面
@@ -34,10 +34,10 @@ public interface BoxCodeFormatService {
     /**
      * 箱码幅面详情信息
      *
-     * @param boxCodeFormatDetailReq 箱码详情入参
+     * @param qrBoxCodeFormatDetailReq 箱码详情入参
      * @return 箱码幅面详情信息
      */
-    BoxCodeFormatDetailRes getBoxCodeFormatDetail(BoxCodeFormatDetailReq boxCodeFormatDetailReq);
+    QrBoxCodeFormatDetailRes getBoxCodeFormatDetail(QrBoxCodeFormatDetailReq qrBoxCodeFormatDetailReq);
 
     /**
      * 启用箱码幅面

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -2,14 +2,14 @@ package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.abi.qms.platform.dao.entity.BaseFactory;
-import com.abi.qms.platform.dao.entity.BoxCodeFormat;
+import com.abi.qms.platform.dao.entity.QrBoxCodeFormat;
 import com.abi.qms.platform.dao.entity.QrPackage;
 import com.abi.qms.platform.dao.entity.UserInfo;
 import com.abi.qms.platform.dao.enums.FactoryTypeEnum;
 import com.abi.qms.platform.dao.enums.LoginTypeEnum;
 import com.abi.qms.platform.dao.enums.ValidEnum;
 import com.abi.qms.platform.dao.mapper.BaseFactoryMapper;
-import com.abi.qms.platform.dao.mapper.BoxCodeFormatMapper;
+import com.abi.qms.platform.dao.mapper.QrBoxCodeFormatMapper;
 import com.abi.qms.platform.dao.mapper.QrPackageMapper;
 import com.abi.qms.platform.dao.mapper.UserInfoMapper;
 import com.abi.qms.platform.dto.req.DisableFactoryReq;
@@ -53,7 +53,7 @@ public class FactoryServiceImpl implements FactoryService {
     private UserInfoMapper userInfoMapper;
 
     @Autowired
-    private BoxCodeFormatMapper boxCodeFormatMapper;
+    private QrBoxCodeFormatMapper qrBoxCodeFormatMapper;
 
     @Autowired
     private QrPackageMapper qrPackageMapper;
@@ -197,12 +197,12 @@ public class FactoryServiceImpl implements FactoryService {
                 throw  new BusinessException("供应商" + factory.getFactoryName() + "已与用户" + userInfos.get(0).getUserName()+ "绑定，请解绑后再停用。");
             }
             //箱码幅面
-            QueryWrapper<BoxCodeFormat> boxCodeFormatQuery = new QueryWrapper<>();
+            QueryWrapper<QrBoxCodeFormat> boxCodeFormatQuery = new QueryWrapper<>();
             boxCodeFormatQuery.eq("factory_id", id);
             boxCodeFormatQuery.eq("is_delete", 0);
-            List<BoxCodeFormat> boxCodeFormats = boxCodeFormatMapper.selectList(boxCodeFormatQuery);
-            if(CollectionUtil.isNotEmpty(boxCodeFormats)){
-                throw  new BusinessException("供应商" + factory.getFactoryName() + "已与箱码幅面" + boxCodeFormats.get(0).getName()+ "绑定，请解绑后再停用。");
+            List<QrBoxCodeFormat> qrBoxCodeFormats = qrBoxCodeFormatMapper.selectList(boxCodeFormatQuery);
+            if(CollectionUtil.isNotEmpty(qrBoxCodeFormats)){
+                throw  new BusinessException("供应商" + factory.getFactoryName() + "已与箱码幅面" + qrBoxCodeFormats.get(0).getName()+ "绑定，请解绑后再停用。");
             }
             //码包
             QueryWrapper<QrPackage> qrPackageQuery = new QueryWrapper<>();

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BoxCodeFormatImpl.java

@@ -1,21 +1,21 @@
 package com.abi.qms.platform.service.impl;
 
-import com.abi.qms.platform.dao.entity.BoxCodeFormat;
+import com.abi.qms.platform.dao.entity.QrBoxCodeFormat;
 import com.abi.qms.platform.dao.enums.StateEnum;
-import com.abi.qms.platform.dao.mapper.BoxCodeFormatMapper;
-import com.abi.qms.platform.dao.vo.result.BoxCodeFormatVO;
-import com.abi.qms.platform.dto.req.BoxCodeFormatDetailReq;
+import com.abi.qms.platform.dao.mapper.QrBoxCodeFormatMapper;
+import com.abi.qms.platform.dao.vo.result.QrBoxCodeFormatVO;
+import com.abi.qms.platform.dto.req.QrBoxCodeFormatDetailReq;
 import com.abi.qms.platform.dto.req.DeleteBoxCodeFormatreq;
 import com.abi.qms.platform.dto.req.DisableBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.EnableBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.ListBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.SaveBoxCodeFormatReq;
-import com.abi.qms.platform.dto.res.BoxCodeFormatDetailRes;
+import com.abi.qms.platform.dto.res.QrBoxCodeFormatDetailRes;
 import com.abi.qms.platform.dto.res.ListBoxCodeFormatRes;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
-import com.abi.qms.platform.service.BoxCodeFormatService;
+import com.abi.qms.platform.service.QrBoxCodeFormatService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.abi.task.common.utils.PojoConverterUtils;
@@ -33,37 +33,37 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class BoxCodeFormatImpl implements BoxCodeFormatService {
+public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
 
     @Autowired
-    private BoxCodeFormatMapper boxCodeFormatMapper;
+    private QrBoxCodeFormatMapper qrBoxCodeFormatMapper;
 
     @Override
     public void saveBoxCodeFormat(SaveBoxCodeFormatReq req) {
 
         //1-声明对象
-        BoxCodeFormat boxCodeFormat = null;
+        QrBoxCodeFormat qrBoxCodeFormat = null;
         if (req.getId() != null) {
-            boxCodeFormat = boxCodeFormatMapper.selectById(req.getId());
-            AssertUtil.isNull(boxCodeFormat, "箱码幅面ID不存在");
+            qrBoxCodeFormat = qrBoxCodeFormatMapper.selectById(req.getId());
+            AssertUtil.isNull(qrBoxCodeFormat, "箱码幅面ID不存在");
         } else {
-            boxCodeFormat = new BoxCodeFormat();
+            qrBoxCodeFormat = new QrBoxCodeFormat();
         }
 
         //2-放入数据
-        boxCodeFormat.setQrRepertoryId(req.getQrRepertoryId());
+        qrBoxCodeFormat.setQrRepertoryId(req.getQrRepertoryId());
         //若当前登录用户为包材厂用户，则该选项默认选择该用户所在的包材厂，不可修改
-        boxCodeFormat.setFactoryId(UserUtil.getUser().getFactoryId() != null ? UserUtil.getUser().getFactoryId() : req.getFactoryId());
-        boxCodeFormat.setName(req.getName());
-        boxCodeFormat.setColorPerRollScalar(req.getColorPerRollScalar());
-        boxCodeFormat.setFormatNumber(req.getFormatNumber());
-        boxCodeFormat.setRemark(req.getRemark());
+        qrBoxCodeFormat.setFactoryId(UserUtil.getUser().getFactoryId() != null ? UserUtil.getUser().getFactoryId() : req.getFactoryId());
+        qrBoxCodeFormat.setName(req.getName());
+        qrBoxCodeFormat.setColorPerRollScalar(req.getColorPerRollScalar());
+        qrBoxCodeFormat.setFormatNumber(req.getFormatNumber());
+        qrBoxCodeFormat.setRemark(req.getRemark());
 
         //3-新增or修改
         if (req.getId() != null) {
-            boxCodeFormatMapper.updateById(boxCodeFormat);
+            qrBoxCodeFormatMapper.updateById(qrBoxCodeFormat);
         } else {
-            boxCodeFormatMapper.insert(boxCodeFormat);
+            qrBoxCodeFormatMapper.insert(qrBoxCodeFormat);
         }
 
     }
@@ -75,8 +75,8 @@ public class BoxCodeFormatImpl implements BoxCodeFormatService {
             req.setFactoryId(UserUtil.getUser().getFactoryId());
         }
         //分页查询
-        IPage<BoxCodeFormatVO> iPage = boxCodeFormatMapper.listBoxCodeFormat(PageUtil.createPage(req), req);
-        List<BoxCodeFormatVO> formatList = iPage.getRecords();
+        IPage<QrBoxCodeFormatVO> iPage = qrBoxCodeFormatMapper.listBoxCodeFormat(PageUtil.createPage(req), req);
+        List<QrBoxCodeFormatVO> formatList = iPage.getRecords();
         //封装出参
         ListBoxCodeFormatRes res = new ListBoxCodeFormatRes();
         //放入分页信息
@@ -89,14 +89,14 @@ public class BoxCodeFormatImpl implements BoxCodeFormatService {
     }
 
     @Override
-    public BoxCodeFormatDetailRes getBoxCodeFormatDetail(BoxCodeFormatDetailReq req) {
+    public QrBoxCodeFormatDetailRes getBoxCodeFormatDetail(QrBoxCodeFormatDetailReq req) {
 
         //查询箱码幅面详情
-        BoxCodeFormatVO boxCodeFormatVO = boxCodeFormatMapper.selectBoxCodeFormatDetailById(req.getId());
-        AssertUtil.isNull(boxCodeFormatVO, "箱码幅面详情不存在");
+        QrBoxCodeFormatVO qrBoxCodeFormatVO = qrBoxCodeFormatMapper.selectBoxCodeFormatDetailById(req.getId());
+        AssertUtil.isNull(qrBoxCodeFormatVO, "箱码幅面详情不存在");
 
         //转化出参
-        BoxCodeFormatDetailRes res = PojoConverterUtils.copy(boxCodeFormatVO, BoxCodeFormatDetailRes.class);
+        QrBoxCodeFormatDetailRes res = PojoConverterUtils.copy(qrBoxCodeFormatVO, QrBoxCodeFormatDetailRes.class);
 
         return res;
     }
@@ -109,15 +109,15 @@ public class BoxCodeFormatImpl implements BoxCodeFormatService {
         //循环启用
         for (Long id : ids) {
             //1-查询活动对象
-            BoxCodeFormat boxCodeFormat = boxCodeFormatMapper.selectById(id);
-            AssertUtil.isNull(boxCodeFormat, "箱码幅面不存在");
-            if (!StateEnum.DISABLE.is(boxCodeFormat.getState())) {
+            QrBoxCodeFormat qrBoxCodeFormat = qrBoxCodeFormatMapper.selectById(id);
+            AssertUtil.isNull(qrBoxCodeFormat, "箱码幅面不存在");
+            if (!StateEnum.DISABLE.is(qrBoxCodeFormat.getState())) {
                 continue;
             }
 
             //2-修改状态
-            boxCodeFormat.setState(StateEnum.ENABLE.getCode());
-            boxCodeFormatMapper.updateById(boxCodeFormat);
+            qrBoxCodeFormat.setState(StateEnum.ENABLE.getCode());
+            qrBoxCodeFormatMapper.updateById(qrBoxCodeFormat);
         }
     }
 
@@ -129,15 +129,15 @@ public class BoxCodeFormatImpl implements BoxCodeFormatService {
         //循环禁用
         for (Long id : ids) {
             //1-查询活动对象
-            BoxCodeFormat boxCodeFormat = boxCodeFormatMapper.selectById(id);
-            AssertUtil.isNull(boxCodeFormat, "箱码幅面不存在");
-            if (!StateEnum.ENABLE.is(boxCodeFormat.getState())) {
+            QrBoxCodeFormat qrBoxCodeFormat = qrBoxCodeFormatMapper.selectById(id);
+            AssertUtil.isNull(qrBoxCodeFormat, "箱码幅面不存在");
+            if (!StateEnum.ENABLE.is(qrBoxCodeFormat.getState())) {
                 continue;
             }
 
             //2-修改状态
-            boxCodeFormat.setState(StateEnum.DISABLE.getCode());
-            boxCodeFormatMapper.updateById(boxCodeFormat);
+            qrBoxCodeFormat.setState(StateEnum.DISABLE.getCode());
+            qrBoxCodeFormatMapper.updateById(qrBoxCodeFormat);
         }
 
     }
@@ -146,17 +146,17 @@ public class BoxCodeFormatImpl implements BoxCodeFormatService {
     public void deleteBoxCodeFormat(DeleteBoxCodeFormatreq req) {
 
         //查询箱码幅面
-        BoxCodeFormat boxCodeFormat = boxCodeFormatMapper.selectById(req.getId());
-        if (boxCodeFormat == null) {
+        QrBoxCodeFormat qrBoxCodeFormat = qrBoxCodeFormatMapper.selectById(req.getId());
+        if (qrBoxCodeFormat == null) {
             throw new BusinessException(ErrorCodeEnum.NO_EXISTS_DATA.getCode(), "箱码幅面不存在");
         }
-        if (boxCodeFormat.getState() == StateEnum.ENABLE.getCode()) {
+        if (qrBoxCodeFormat.getState() == StateEnum.ENABLE.getCode()) {
             throw new BusinessException("该箱码幅面还在启用中，不能删除。");
         }
 
         //逻辑删除
-        boxCodeFormat.setIsDelete(1);
-        boxCodeFormatMapper.updateById(boxCodeFormat);
+        qrBoxCodeFormat.setIsDelete(1);
+        qrBoxCodeFormatMapper.updateById(qrBoxCodeFormat);
     }
 
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BoxCodeFormatMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.abi.qms.platform.dao.mapper.BoxCodeFormatMapper">
+<mapper namespace="com.abi.qms.platform.dao.mapper.QrBoxCodeFormatMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BoxCodeFormat">
+    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.QrBoxCodeFormat">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="dept_id" property="deptId"/>
@@ -25,7 +25,7 @@
         id,name,dept_id,qr_repertory_id,factory_id,color_per_roll_scalar,format_number,remark,state,create_by,create_time,update_by,update_time,is_delete
     </sql>
 
-    <select id="listBoxCodeFormat" resultType="com.abi.qms.platform.dao.vo.result.BoxCodeFormatVO">
+    <select id="listBoxCodeFormat" resultType="com.abi.qms.platform.dao.vo.result.QrBoxCodeFormatVO">
         select bcf.id, bcf.name,bcf.color_per_roll_scalar,bcf.format_number,bcf.remark,
         bcf.state,bcf.update_time,bf.factory_name, bcf.qr_repertory_id, qr.name qrRepertoryName
         from qr_box_code_format bcf
@@ -46,7 +46,7 @@
         order by bcf.create_time desc
     </select>
 
-    <select id="selectBoxCodeFormatDetailById" resultType="com.abi.qms.platform.dao.vo.result.BoxCodeFormatVO">
+    <select id="selectBoxCodeFormatDetailById" resultType="com.abi.qms.platform.dao.vo.result.QrBoxCodeFormatVO">
         select bcf.id, bcf.name,bcf.color_per_roll_scalar,bcf.format_number,bcf.remark,
         bcf.state,bcf.update_time,bf.factory_name,bcf.dept_id,bcf.qr_repertory_id,bcf.factory_id, bcf.qr_repertory_id, qr.name qrRepertoryName
         from qr_box_code_format bcf