Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/pom.xml

@@ -15,6 +15,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <jwt.version>3.4.0</jwt.version>
+        <ootb.version>0.0.1-SNAPSHOT</ootb.version>
     </properties>
 
     <dependencies>
@@ -47,11 +48,11 @@
             <artifactId>javax.mail</artifactId>
             <version>1.6.0</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.abi.sms</groupId>-->
-<!--            <artifactId>sms-center-client</artifactId>-->
-<!--            <version>1.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.abi.ootb.core</groupId>
+            <artifactId>ootb-core</artifactId>
+            <version>${ootb.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.abi.bees</groupId>
             <artifactId>sms-center-api</artifactId>

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/wx/WxQrBoxMappingController.java

@@ -1,6 +1,12 @@
 package com.abi.qms.platform.controller.wx;
 
+import com.abi.qms.platform.dto.req.ActivateDetailReq;
+import com.abi.qms.platform.dto.req.ActivateNowReq;
+import com.abi.qms.platform.dto.req.ActivationRecordReq;
 import com.abi.qms.platform.dto.req.QueryWxQrBoxMappingDetailsWxReq;
+import com.abi.qms.platform.dto.req.ReplenishActivationReq;
+import com.abi.qms.platform.dto.res.ActivateDetailRes;
+import com.abi.qms.platform.dto.res.ActivationRecordRes;
 import com.abi.qms.platform.dto.res.QueryWxQrBoxMappingDetailsWxRes;
 import com.abi.qms.platform.service.QrBoxMappingService;
 import com.abi.task.common.api.base.BaseResponse;
@@ -9,7 +15,11 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author lu
@@ -18,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @RestController
 @RequestMapping("/wxQrBoxMapping")
-@Api(tags = "条码查询")
+@Api(tags = "微信箱码管理")
 public class WxQrBoxMappingController {
 
     @Autowired
@@ -26,10 +36,11 @@ public class WxQrBoxMappingController {
 
     /**
      * 微信 - 箱码/条码详情
+     *
+     * @param queryWxQrBoxMappingDetailsWxReq
+     * @return com.abi.task.common.api.base.BaseResponse<com.abi.qms.platform.dto.res.QueryWxQrBoxMappingDetailsWxRes>
      * @author lu
      * @date 2021/6/9 11:24
-     * @param queryWxQrBoxMappingDetailsWxReq 
-     * @return com.abi.task.common.api.base.BaseResponse<com.abi.qms.platform.dto.res.QueryWxQrBoxMappingDetailsWxRes>
      */
     @ApiOperation("激活详情")
     @PostMapping("queryWxQrBoxMappingDetails")
@@ -38,4 +49,40 @@ public class WxQrBoxMappingController {
         return BaseResponse.create(res);
     }
 
+    @ApiOperation("补充激活")
+    @PostMapping("replenishActivation")
+    public BaseResponse replenishActivation(@RequestBody ReplenishActivationReq replenishActivationReq) {
+        //补充激活
+        qrBoxMappingService.replenishActivation(replenishActivationReq);
+        //包装出参
+        return BaseResponse.create();
+    }
+
+    @ApiOperation("激活记录")
+    @GetMapping("getActivationRecord")
+    public BaseResponse<ActivationRecordRes> getActivationRecord(@Validated ActivationRecordReq activationRecordReq) {
+        //补充激活
+        ActivationRecordRes res = qrBoxMappingService.getActivationRecord(activationRecordReq);
+        //包装出参
+        return BaseResponse.create(res);
+    }
+
+    @ApiOperation("立即激活")
+    @PostMapping("activateNow")
+    public BaseResponse activateNow(@Validated ActivateNowReq activateNowReq) {
+        //立即激活
+        qrBoxMappingService.activateNow(activateNowReq);
+        //包装出参
+        return BaseResponse.create();
+    }
+
+    @ApiOperation("激活详情")
+    @GetMapping("getActivateDetail")
+    public BaseResponse<ActivateDetailRes> getActivateDetail(@Validated ActivateDetailReq activateDetailReq) {
+        //立即激活
+        ActivateDetailRes res = qrBoxMappingService.getActivateDetail(activateDetailReq);
+        //包装出参
+        return BaseResponse.create(res);
+    }
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/wx/WxQrPackageController.java

@@ -1,10 +1,7 @@
 package com.abi.qms.platform.controller.wx;
 
-import com.abi.qms.platform.dto.req.ActivationRecordReq;
 import com.abi.qms.platform.dto.req.ListQrPackageWxReq;
-import com.abi.qms.platform.dto.req.ReplenishActivationReq;
 import com.abi.qms.platform.dto.req.WxQrPackageDetailReq;
-import com.abi.qms.platform.dto.res.ActivationRecordRes;
 import com.abi.qms.platform.dto.res.ListQrPackageWxRes;
 import com.abi.qms.platform.dto.res.WxQrPackageDetailRes;
 import com.abi.qms.platform.service.QrPackageService;
@@ -15,8 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -28,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("wx/qrPackage")
-@Api(tags = "码包管理")
+@Api(tags = "微信码包管理")
 public class WxQrPackageController {
 
     @Autowired
@@ -52,22 +47,5 @@ public class WxQrPackageController {
         return BaseResponse.create(res);
     }
 
-    @ApiOperation("补充激活")
-    @PostMapping("replenishActivation")
-    public BaseResponse replenishActivation(@RequestBody ReplenishActivationReq replenishActivationReq) {
-        //补充激活
-        qrPackageService.replenishActivation(replenishActivationReq);
-        //包装出参
-        return BaseResponse.create();
-    }
-
-    @ApiOperation("激活记录")
-    @GetMapping("getActivationRecord")
-    public BaseResponse<ActivationRecordRes> getActivationRecord(@Validated ActivationRecordReq activationRecordReq) {
-        //补充激活
-        ActivationRecordRes res = qrPackageService.getActivationRecord(activationRecordReq);
-        //包装出参
-        return BaseResponse.create(res);
-    }
 
 }

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

@@ -94,5 +94,11 @@ public class QrBoxMapping {
     @ApiModelProperty(value = "是否作废 0-未作废 1-已作废")
     private Integer invalid;
 
+    @ApiModelProperty(value = "产线名称")
+    private String productionLineName;
+
+    @ApiModelProperty(value = "生产日期")
+    private LocalDateTime productionTime;
+
 
 }

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

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.entity.QrBoxMapping;
+import com.abi.qms.platform.dao.vo.result.ActivateDetailVo;
 import com.abi.qms.platform.dao.vo.result.ActivationRecordVO;
 import com.abi.qms.platform.dao.vo.result.PrintingDetailVO;
 import com.abi.qms.platform.dao.vo.result.QrBoxMappingVO;
@@ -66,4 +67,12 @@ public interface QrBoxMappingMapper extends BaseMapper<QrBoxMapping> {
      * @return
      */
     List<ActivationRecordVO> getActivationRecord(@Param("req") ActivationRecordReq req);
+
+    /**
+     * 查询激活详情
+     *
+     * @param boxCode
+     * @return
+     */
+    ActivateDetailVo getActivateDetail(@Param("boxCode") String boxCode);
 }

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

@@ -0,0 +1,29 @@
+package com.abi.qms.platform.dao.vo.result;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/10 11:39
+ * @description:
+ */
+@Data
+@ApiModel
+public class ActivateDetailVo implements Serializable {
+
+    @ApiModelProperty(value = "条码序号")
+    private String boxCode;
+
+    @ApiModelProperty(value = "活动名称")
+    private String activeName;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "盖码数量")
+    private Integer capNum;
+}

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

@@ -0,0 +1,22 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/10 11:30
+ * @description: 激活详情入参
+ */
+@Data
+@ApiModel
+public class ActivateDetailReq implements Serializable {
+
+    @NotNull(message = "条码序号不能为空")
+    @ApiModelProperty(value = "条码序号")
+    private String boxCode;
+}

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

@@ -0,0 +1,27 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/10 10:03
+ * @description: 立即激活入参
+ */
+@Data
+@ApiModel
+public class ActivateNowReq implements Serializable {
+
+    @ApiModelProperty(value = "条码序号")
+    private List<String> boxCodeList;
+
+    @ApiModelProperty(value = "产线名称")
+    private String productionLineName;
+
+    @ApiModelProperty(value = "生产日期")
+    private String productionTime;
+}

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

@@ -15,6 +15,9 @@ import java.io.Serializable;
 @ApiModel
 public class ActivationRecordReq implements Serializable {
 
+    @ApiModelProperty(value = "条码序号")
+    private String boxCode;
+
     @ApiModelProperty(value = "月份")
     private String month;
 }

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

@@ -18,8 +18,4 @@ public class ListQrPackageWxReq implements Serializable {
     @ApiModelProperty(value = "码包ID/活动名称/物料名称")
     private String queryParam;
 
-    @ApiModelProperty(value = "激活状态 0-未激活 1-已激活")
-    private Integer activeStatus;
-
-
 }

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

@@ -0,0 +1,29 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/10 11:31
+ * @description: 激活详情出参
+ */
+@Data
+@ApiModel
+public class ActivateDetailRes implements Serializable {
+
+    @ApiModelProperty(value = "条码序号")
+    private String boxCode;
+
+    @ApiModelProperty(value = "活动名称")
+    private String activeName;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "盖码数量")
+    private Integer capNum;
+}

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

@@ -41,11 +41,11 @@ public class ListQrPackageWxRes implements Serializable {
         @ApiModelProperty(value = "物料名称")
         private String materialName;
 
-        @ApiModelProperty(value = "条码总数")
-        private Integer packageTotalNum;
+        @ApiModelProperty(value = "激活箱数")
+        private Integer activeBoxCount;
 
-        @ApiModelProperty(value = "已激活条码数")
-        private Integer activePackageNum;
+        @ApiModelProperty(value = "箱码总数")
+        private Integer totalBoxCount;
     }
 
 }

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

@@ -1,10 +1,16 @@
 package com.abi.qms.platform.service;
 
+import com.abi.qms.platform.dto.req.ActivateDetailReq;
+import com.abi.qms.platform.dto.req.ActivateNowReq;
+import com.abi.qms.platform.dto.req.ActivationRecordReq;
 import com.abi.qms.platform.dto.req.ActiveBoxCodeReq;
 import com.abi.qms.platform.dto.req.GenerateBarCodeReq;
 import com.abi.qms.platform.dto.req.ListQrBoxCodeMappingReq;
 import com.abi.qms.platform.dto.req.PrintingDetailReq;
 import com.abi.qms.platform.dto.req.QueryWxQrBoxMappingDetailsWxReq;
+import com.abi.qms.platform.dto.req.ReplenishActivationReq;
+import com.abi.qms.platform.dto.res.ActivateDetailRes;
+import com.abi.qms.platform.dto.res.ActivationRecordRes;
 import com.abi.qms.platform.dto.res.ListQrBoxCodeMappingRes;
 import com.abi.qms.platform.dto.res.PrintingDetailRes;
 import com.abi.qms.platform.dto.res.QrBoxCodeUploadRes;
@@ -76,4 +82,33 @@ public interface QrBoxMappingService {
      */
     QueryWxQrBoxMappingDetailsWxRes queryWxQrBoxMappingDetails(QueryWxQrBoxMappingDetailsWxReq queryWxQrBoxMappingDetailsWxReq);
 
+    /**
+     * 补充激活
+     *
+     * @param replenishActivationReq
+     */
+    void replenishActivation(ReplenishActivationReq replenishActivationReq);
+
+    /**
+     * 激活记录
+     *
+     * @param activationRecordReq
+     * @return
+     */
+    ActivationRecordRes getActivationRecord(ActivationRecordReq activationRecordReq);
+
+    /**
+     * 立即激活
+     *
+     * @param activateNowReq
+     */
+    void activateNow(ActivateNowReq activateNowReq);
+
+    /**
+     * 激活详情
+     *
+     * @param activateDetailReq
+     * @return
+     */
+    ActivateDetailRes getActivateDetail(ActivateDetailReq activateDetailReq);
 }

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

@@ -2,7 +2,6 @@ package com.abi.qms.platform.service;
 
 
 import com.abi.qms.platform.dao.entity.QrPackage;
-import com.abi.qms.platform.dto.req.ActivationRecordReq;
 import com.abi.qms.platform.dto.req.DeleteQrPackageReq;
 import com.abi.qms.platform.dto.req.DownloadQrPackageReq;
 import com.abi.qms.platform.dto.req.GetPackageCodeReq;
@@ -14,12 +13,10 @@ import com.abi.qms.platform.dto.req.ListQrPackageReq;
 import com.abi.qms.platform.dto.req.ListQrPackageWxReq;
 import com.abi.qms.platform.dto.req.PassQrPackageReq;
 import com.abi.qms.platform.dto.req.RefuseQrPackageReq;
-import com.abi.qms.platform.dto.req.ReplenishActivationReq;
 import com.abi.qms.platform.dto.req.SaveQrPackageReq;
 import com.abi.qms.platform.dto.req.SendMobileMsgReq;
 import com.abi.qms.platform.dto.req.ValidSAPOrderNoAndMaterialReq;
 import com.abi.qms.platform.dto.req.WxQrPackageDetailReq;
-import com.abi.qms.platform.dto.res.ActivationRecordRes;
 import com.abi.qms.platform.dto.res.GetPackageCodeRes;
 import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
 import com.abi.qms.platform.dto.res.GetQrSingleCheckDetailRes;
@@ -147,19 +144,4 @@ public interface QrPackageService {
      * @return
      */
     WxQrPackageDetailRes getWxQrPackageDetail(WxQrPackageDetailReq wxQrPackageDetailReq);
-
-    /**
-     * 补充激活
-     *
-     * @param replenishActivationReq
-     */
-    void replenishActivation(ReplenishActivationReq replenishActivationReq);
-
-    /**
-     * 激活记录
-     *
-     * @param activationRecordReq
-     * @return
-     */
-    ActivationRecordRes getActivationRecord(ActivationRecordReq activationRecordReq);
 }

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

@@ -56,7 +56,7 @@ public class BreweryProductionLineServiceImpl implements BreweryProductionLineSe
     }
 
     /**
-     * 新增接口
+     * 删除接口
      * @author lu
      * @date 2021/6/9 14:38
      * @param req

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

@@ -8,14 +8,22 @@ import com.abi.qms.platform.dao.enums.InvalidEnum;
 import com.abi.qms.platform.dao.mapper.BaseFactoryMapper;
 import com.abi.qms.platform.dao.mapper.QrBoxMappingMapper;
 import com.abi.qms.platform.dao.tablestore.entity.QrCode;
+import com.abi.qms.platform.dao.vo.result.ActivateDetailVo;
+import com.abi.qms.platform.dao.vo.result.ActivationRecordVO;
 import com.abi.qms.platform.dao.vo.result.PrintingDetailVO;
 import com.abi.qms.platform.dao.vo.result.QrBoxMappingVO;
 import com.abi.qms.platform.dao.vo.result.QueryWxQrBoxMappingDetailsVO;
+import com.abi.qms.platform.dto.req.ActivateDetailReq;
+import com.abi.qms.platform.dto.req.ActivateNowReq;
+import com.abi.qms.platform.dto.req.ActivationRecordReq;
 import com.abi.qms.platform.dto.req.ActiveBoxCodeReq;
 import com.abi.qms.platform.dto.req.GenerateBarCodeReq;
 import com.abi.qms.platform.dto.req.ListQrBoxCodeMappingReq;
 import com.abi.qms.platform.dto.req.PrintingDetailReq;
 import com.abi.qms.platform.dto.req.QueryWxQrBoxMappingDetailsWxReq;
+import com.abi.qms.platform.dto.req.ReplenishActivationReq;
+import com.abi.qms.platform.dto.res.ActivateDetailRes;
+import com.abi.qms.platform.dto.res.ActivationRecordRes;
 import com.abi.qms.platform.dto.res.ListQrBoxCodeMappingRes;
 import com.abi.qms.platform.dto.res.PrintingDetailRes;
 import com.abi.qms.platform.dto.res.QrBoxCodeUploadRes;
@@ -213,6 +221,71 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
         return PojoConverterUtils.copy(query, QueryWxQrBoxMappingDetailsWxRes.class);
     }
 
+    @Override
+    public void replenishActivation(ReplenishActivationReq req) {
+
+        QrBoxMapping qrBoxMapping = getActiveQrBoxMapping(req.getBoxCode());
+        qrBoxMapping.setRemark(req.getReason());
+
+        qrBoxMappingMapper.updateById(qrBoxMapping);
+
+    }
+
+    @Override
+    public ActivationRecordRes getActivationRecord(ActivationRecordReq req) {
+        ActivationRecordRes res = new ActivationRecordRes();
+
+        List<ActivationRecordVO> recordVOList = qrBoxMappingMapper.getActivationRecord(req);
+        List<ActivationRecordRes.ActivationRecordBean> beanList = PojoConverterUtils.copyList(recordVOList, ActivationRecordRes.ActivationRecordBean.class);
+        res.setActivationRecordBeanList(beanList);
+        return res;
+    }
+
+    @Override
+    public void activateNow(ActivateNowReq req) {
+
+        List<String> boxCodeList = req.getBoxCodeList();
+        for (String boxCode : boxCodeList) {
+
+            QrBoxMapping qrBoxMapping = getActiveQrBoxMapping(boxCode);
+            qrBoxMapping.setProductionLineName(req.getProductionLineName());
+            qrBoxMapping.setProductionTime(LocalDateTime.parse(req.getProductionTime()));
+
+            qrBoxMappingMapper.updateById(qrBoxMapping);
+
+        }
+
+    }
+
+    @Override
+    public ActivateDetailRes getActivateDetail(ActivateDetailReq req) {
+
+        ActivateDetailVo activateDetailVo = qrBoxMappingMapper.getActivateDetail(req.getBoxCode());
+
+        ActivateDetailRes res = PojoConverterUtils.copy(activateDetailVo, ActivateDetailRes.class);
+        return res;
+    }
+
+    /**
+     * 组装激活公共所需参数
+     *
+     * @param boxCode
+     * @return
+     */
+    private QrBoxMapping getActiveQrBoxMapping(String boxCode) {
+        QueryWrapper<QrBoxMapping> qw = new QueryWrapper<>();
+        qw.eq("box_code", boxCode);
+        qw.eq("is_delete", 0);
+        QrBoxMapping qrBoxMapping = qrBoxMappingMapper.selectOne(qw);
+        AssertUtil.isNull(qrBoxMapping, "条码序号错误，未找到该条码序号！");
+        qrBoxMapping.setActiveTime(LocalDateTime.now());
+        qrBoxMapping.setActiveStatus(BoxMappingActiveStatusEnum.ACTIVATED.getCode());
+        qrBoxMapping.setActiveUserId(userUtil.getUser().getId());
+        qrBoxMapping.setActiveUserName(userUtil.getUser().getUserName());
+
+        return qrBoxMapping;
+    }
+
 
     /**
      * 根据主键查询已生成码包位置

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

@@ -948,33 +948,6 @@ public class QrPackageServiceImpl implements QrPackageService {
         return res;
     }
 
-    @Override
-    public void replenishActivation(ReplenishActivationReq req) {
-
-        QueryWrapper<QrBoxMapping> qw = new QueryWrapper<>();
-        qw.eq("box_code", req.getBoxCode());
-        qw.eq("is_delete", 0);
-        QrBoxMapping qrBoxMapping = qrBoxMappingMapper.selectOne(qw);
-        qrBoxMapping.setActiveTime(LocalDateTime.now());
-        qrBoxMapping.setActiveStatus(BoxMappingActiveStatusEnum.ACTIVATED.getCode());
-        qrBoxMapping.setActiveUserId(userUtil.getUser().getId());
-        qrBoxMapping.setActiveUserName(userUtil.getUser().getUserName());
-        qrBoxMapping.setRemark(req.getReason());
-
-        qrBoxMappingMapper.updateById(qrBoxMapping);
-
-    }
-
-    @Override
-    public ActivationRecordRes getActivationRecord(ActivationRecordReq req) {
-        ActivationRecordRes res = new ActivationRecordRes();
-
-        List<ActivationRecordVO> recordVOList = qrBoxMappingMapper.getActivationRecord(req);
-        List<ActivationRecordRes.ActivationRecordBean> beanList = PojoConverterUtils.copyList(recordVOList, ActivationRecordRes.ActivationRecordBean.class);
-        res.setActivationRecordBeanList(beanList);
-        return res;
-    }
-
     /**
      * 根据物料类型转换码类型
      * 物料类型： 3-罐子 4-瓶盖 5-纸板箱

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

@@ -26,13 +26,15 @@
         <result column="UPDATE_BY" property="updateBy"/>
         <result column="IS_DELETE" property="isDelete"/>
         <result column="invalid" property="invalid"/>
+        <result column="production_line_name" property="productionLineName"/>
+        <result column="production_time" property="productionTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, box_code, index_begin, index_end, begin_qr_code, end_qr_code, qr_code_count, active_status, active_time,
         active_user_id, active_user_name, package_id, project_no, board_no, remark, create_user_name, create_time,
-        create_by, update_time, update_by, is_delete, invalid
+        create_by, update_time, update_by, is_delete, invalid,production_line_name,production_time
     </sql>
 
     <select id="listQrBoxCodeMapping" resultType="com.abi.qms.platform.dao.vo.result.QrBoxMappingVO">
@@ -90,7 +92,7 @@
             mapping.box_code ,
             material.material_name,
             active.active_name,
-            mapping.qr_code_count
+            case when qpckage.qr_type = 2 then qpckage.qr_number else 0 end AS qrCodeCount
         FROM
             qr_box_mapping AS mapping
             LEFT JOIN qr_package AS qpckage ON qpckage.id = mapping.package_id
@@ -115,4 +117,18 @@
         </where>
     </select>
 
+    <select id="getActivateDetail" resultType="com.abi.qms.platform.dao.vo.result.ActivateDetailVo">
+        select qbm.box_code,ba.active_name,bm.material_name,
+            case when qp.qr_type = 2 then qp.qr_number else 0 end as capNum
+        from qr_box_mapping qbm
+            left join qr_package qp on qbm.package_id=qp.id
+            left join base_material bm on bm.id = qp.material_id
+            left join base_active ba on ba.id =bm.active_id
+        <where>
+             <if test="boxCode != null and boxCode !=''">
+                 qbm.box_code = #{boxCode}
+             </if>
+        </where>
+    </select>
+
 </mapper>