码包列表修改码数量

打印增加活动名称

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

@@ -51,7 +51,6 @@ public class QrBoxCodeUnityController {
     @ApiOperation("箱码合一文件上传")
     @PostMapping("/uploads/{packageId}")
     public BaseResponse<QrBoxCodeUploadRes> uploadCodeFiles(HttpServletRequest request, @PathVariable("packageId") Long packageId) {
-
         //拿到文件
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Map<String, MultipartFile> map = multipartRequest.getFileMap();
@@ -59,7 +58,6 @@ public class QrBoxCodeUnityController {
         QrBoxCodeUploadRes res = qrBoxMappingService.uploadCodeFiles(map, packageId);
 
         return BaseResponse.create(res);
-
     }
 
     @ApiOperation("分页查询箱码合一列表")

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

@@ -39,6 +39,9 @@ public class PrintingDetailVO {
     @ApiModelProperty(value = "物料名称")
     private String materialName;
 
+    @ApiModelProperty(value = "活动名称")
+    private String activeName;
+
     //603版 已作废
     /*@ApiModelProperty(value = "sku名称")
     private String skuName;*/

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

@@ -42,6 +42,9 @@ public class PrintingDetailRes implements Serializable {
     @ApiModelProperty(value = "物料名称")
     private String materialName;
 
+    @ApiModelProperty(value = "活动名称")
+    private String activeName;
+
     //603版 已作废
     /*@ApiModelProperty(value = "sku名称")
     private String skuName;*/

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

@@ -243,11 +243,11 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
     @Override
     public PrintingDetailRes getPrintingDetail(PrintingDetailReq req) {
         PrintingDetailVO printingDetail = qrBoxMappingMapper.getPrintingDetail(req.getBoxCode());
+
+        //构造出参
         PrintingDetailRes res = PojoConverterUtils.copy(printingDetail, PrintingDetailRes.class);
-        res.setFactoryCoverName(null == printingDetail.getFactoryCoverLevelTwoId() ?
-                "" : getFactoryName(printingDetail.getFactoryCoverLevelTwoId()));
-        res.setFactoryBeerName(null == printingDetail.getFactoryBeerId() ?
-                "" : getFactoryName(printingDetail.getFactoryBeerId()));
+        res.setFactoryCoverName(null == printingDetail.getFactoryCoverLevelTwoId() ? "" : getFactoryName(printingDetail.getFactoryCoverLevelTwoId()));
+        res.setFactoryBeerName(null == printingDetail.getFactoryBeerId() ? "" : getFactoryName(printingDetail.getFactoryBeerId()));
         return res;
     }
 

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

@@ -536,11 +536,24 @@ public class QrPackageServiceImpl implements QrPackageService {
         IPage<QrPackageVO> iPage = qrPackageMapper.listQrPackage(PageUtil.createPage(req), req);
         List<QrPackageVO> qrPackageList = iPage.getRecords();
 
-        // 判断是否一级包材厂，如果不是，状态为已创建，如果是按表中值
+        // 是否一级包材厂
+        boolean isLevelOne = false;
         if (FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType())) {
             BaseFactory factory = baseFactoryMapper.selectById(userUtil.getWholeUser().getFactoryId());
-            if (ObjectUtils.isNotEmpty(factory) && TrueFalseEnum.TRUE.is(factory.getIsFirstFactory())) {
-                qrPackageList.stream().forEach(s -> s.setInvalid(QrPackageGenerateStatusEnum.CREATE_BEEN.getCode()));
+            isLevelOne = ObjectUtils.isNotEmpty(factory) && TrueFalseEnum.TRUE.is(factory.getIsFirstFactory());
+        }
+
+        for(QrPackageVO qrPackageVO:qrPackageList){
+            // 判断是否一级包材厂，如果是，状态为已创建，否则按表中的值展示
+            if(isLevelOne){
+                qrPackageVO.setInvalid(QrPackageGenerateStatusEnum.CREATE_BEEN.getCode());
+            }
+            // 码量按照+备用码量来计算
+            if(qrPackageVO.getStandbyRatio()>0){
+                Long qrNumber = qrPackageVO.getQrNumber();
+                int standbyRatio = IMathUtils.asInt(qrPackageVO.getStandbyRatio());
+                qrNumber = new Double(qrNumber*(1+standbyRatio/100d)).longValue();
+                qrPackageVO.setQrNumber(qrNumber);
             }
         }
 
@@ -553,6 +566,7 @@ public class QrPackageServiceImpl implements QrPackageService {
         return res;
     }
 
+
     /**
      * 码包查询详情
      */

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

@@ -85,11 +85,13 @@
         select
             qbm.begin_qr_code,qbm.end_qr_code,qbm.create_time,qbm.box_code,qbm.qr_code_count,
             qp.factory_cover_level_two_id,qp.factory_beer_id,
-            ifnull(book.material_name,bm.material_name) as material_name
+            ifnull(book.material_name,bm.material_name) as material_name,
+            act.active_name
         from qr_box_mapping qbm
             inner join qr_package qp on qp.id=qbm.package_id
             left join base_material bm on bm.id=qp.material_id
             left join qr_package_booking_order book on book.booking_order=qp.booking_order
+            left join base_active act on act.id = bm.active_id
         <where>
             <if test="boxCode != null and boxCode!='' ">
                 qbm.box_code = #{boxCode}

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

@@ -45,6 +45,7 @@
             qp.sap_order_no,
             qp.booking_order,
             qp.qr_number,
+            qp.standby_ratio,
             qp.apply_status,
             qp.is_download,
             qp.create_time,