修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/enums/QrPackageGenerateStatusEnum.java

@@ -22,8 +22,8 @@ public enum QrPackageGenerateStatusEnum {
 	UN_GENERATE(0,"未生成"),
 	GENERATING(1,"生成中"),
 	GENERATE_SUCCESS(2,"已生成"),
-	GENERATE_FAIL(3,"失败");
-
+	GENERATE_FAIL(3,"失败"),
+	CREATE_BEEN(4,"已创建");
 	@EnumValue
 	private Integer code;
 	private String name;

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

@@ -93,7 +93,7 @@ public class ListQrPackageRes extends PageResp implements Serializable {
         @ApiModelProperty(value = "创建人名称")
         private String createByName;
 
-        @ApiModelProperty(value = "是否作废 0-未作废 1-已作废")
+        @ApiModelProperty(value = "码包状态0-未生成，1-生成中，2-已生成，3-失败，4-已创建，9-已作废")
         private Integer invalid;
     }
 }

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

@@ -427,11 +427,14 @@ public class QrPackageServiceImpl implements QrPackageService {
         if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType())) {
             req.setFactoryCoverId(userUtil.getWholeUser().getFactoryId());
         }
-
         // 分页查询
         IPage<QrPackageVO> iPage = qrPackageMapper.listQrPackage(PageUtil.createPage(req), req);
         List<QrPackageVO> qrPackageList = iPage.getRecords();
 
+        //判断是否二级包材厂，如果不是，状态为已创建，如果是按表中值
+        if(FactoryTypeEnum.TWO_COVER.is(userUtil.getWholeUser().getFactoryType())) {
+            qrPackageList.stream().forEach(s -> s.setInvalid(QrPackageGenerateStatusEnum.CREATE_BEEN.getCode()));
+        }
         // 封装出参、放入分页信息
         ListQrPackageRes res = new ListQrPackageRes();
         PageUtil.copyPageInfo(res, iPage);
@@ -876,7 +879,6 @@ public class QrPackageServiceImpl implements QrPackageService {
 
         QrPackage qrPackage = qrPackageMapper.selectById(req.getId());
         AssertUtil.isNull(qrPackage, "该码包不存在！");
-
         qrPackage.setInvalid(InvalidEnum.INVALID.getCode());
         qrPackage.setUpdateBy(user.getId());
         qrPackage.setUpdateTime(LocalDateTime.now());

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

@@ -51,7 +51,7 @@
             bf.factory_name AS factory_cover_name,
             bcf.name AS box_code_format_name,
             ui.user_name AS create_by_name,
-            qp.invalid
+            case when qp.invalid=0 then qp.generate_status else 9 end as invalid
         FROM
             qr_package qp
             LEFT JOIN qr_box_code_format bcf ON qp.box_code_format_id = bcf.id