码包bug

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-生成中，2-已生成，3-失败，4-已创建，9-已作废")
+        @ApiModelProperty(value = "码包状态 0-未生成，1-生成中，2-已生成，3-失败，4-已创建，9-已作废")
         private Integer invalid;
     }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/runner/CheckTableStoreRunner.java

@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @version: 1.0
  * @todo:
  */
-//@Component
+@Component
 @Slf4j
 public class CheckTableStoreRunner implements ApplicationRunner {
 

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

@@ -79,7 +79,7 @@ public interface QrPackageService {
      * 码包生成完成后发送邮件给码包厂负责人邮箱
      *
      * @param targetEmail
-     * @param sapOrderNo
+     * @param qrPackage
      * @param filename
      * @param password
      */

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

@@ -339,6 +339,17 @@ public class QrPackageServiceImpl implements QrPackageService {
             throw new BusinessException("预订单号不能为空");
         }
 
+        //如果有预订单号，需要判断是否被其他码包用过了
+        if(isAdd && StringUtils.isNotBlank(req.getBookingOrder())){
+            QueryWrapper<QrPackage> qrPackageQw = new QueryWrapper<>();
+            qrPackageQw.eq("booking_order",req.getBookingOrder());
+            qrPackageQw.eq("is_delete",0);
+            List<QrPackage> qrPackageList = qrPackageMapper.selectList(qrPackageQw);
+            if(CollectionUtil.isNotEmpty(qrPackageList)){
+                throw new BusinessException("预订单号已被其他码包使用");
+            }
+        }
+
         //如果SAP订单号和物料有重复数据，需提交额外申请原因
         if (StringUtils.isNotBlank(req.getSapOrderNo()) && req.getReasonApply() == null) {
             ValidSAPOrderNoAndMaterialReq reqValid = new ValidSAPOrderNoAndMaterialReq();
@@ -421,7 +432,7 @@ public class QrPackageServiceImpl implements QrPackageService {
      */
     @Override
     public ListQrPackageRes listQrPackage(ListQrPackageReq req) {
-        //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
+        // 数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
         if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType())) {
             req.setFactoryCoverId(userUtil.getWholeUser().getFactoryId());
         }
@@ -430,10 +441,14 @@ public class QrPackageServiceImpl implements QrPackageService {
         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()));
+        // 判断是否一级包材厂，如果不是，状态为已创建，如果是按表中值
+        if(FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType())) {
+            BaseFactory factory = baseFactoryMapper.selectById(userUtil.getWholeUser().getFactoryId());
+            if(TrueFalseEnum.TRUE.is(factory.getIsFirstFactory())){
+                qrPackageList.stream().forEach(s -> s.setInvalid(QrPackageGenerateStatusEnum.CREATE_BEEN.getCode()));
+            }
         }
+
         // 封装出参、放入分页信息
         ListQrPackageRes res = new ListQrPackageRes();
         PageUtil.copyPageInfo(res, iPage);
@@ -661,9 +676,9 @@ public class QrPackageServiceImpl implements QrPackageService {
                 .setQrPackageId(qrPackage.getId());
         qrPackageDownloadRecordMapper.insert(downloadRecord);
         //更新码包表下载时间
-        QrPackage qrPackages = new QrPackage()
-                .setDownloadTime(LocalDateTime.now());
-        qrPackageMapper.updateById(qrPackages);
+        qrPackage.setIsDownload(1);
+        qrPackage.setDownloadTime(LocalDateTime.now());
+        qrPackageMapper.updateById(qrPackage);
     }
 
     /**