循环盘点增加定时任务，盘点任务、盘点申请、盘点记录增加明盘字段，静态资源去掉登录权限。

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java

@@ -42,6 +42,8 @@ public class SecurityConfiguration {
                 // magic-api 允许匿名访问
                 registry.antMatchers("/magic/web/**").anonymous()
                         .antMatchers("/magic-api/**").anonymous();
+                //静态资源
+                registry.antMatchers("/profile/**").anonymous();
                 // 文件读取
                 registry.antMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll();
             }

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@@ -933,6 +933,7 @@ public interface ErrorCodeConstants {
     ErrorCode COUNT_PLAN_CANNOT_PUBLISH = new ErrorCode(1_000_152_008, "盘点计划状态不支持发布");
     ErrorCode COUNT_PLAN_CANNOT_OPEN = new ErrorCode(1_000_152_009, "盘点计划状态不支持打开");
     ErrorCode COUNT_PLAN_CANNOT_RESETTING = new ErrorCode(1_000_152_010, "盘点计划状态不支持重置");
+    ErrorCode COUNT_PLAN_CRON_ERROR = new ErrorCode(1_000_152_010, "盘点计划加入定时任务失败");
     //盘点申请ErrorCode
     ErrorCode COUNT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_153_000, "盘点申请主不存在");
     ErrorCode COUNT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_153_001, "盘点申请子不存在");

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java

@@ -27,6 +27,9 @@ public class CountJobMainBaseVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java

@@ -5,6 +5,7 @@ import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.enums.request.RequestStatusConverter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -29,6 +30,9 @@ public class CountJobMainExcelVO {
     @DictFormat(DictTypeConstants.COUNT_STAGE)
     private String stage;
 
+    @ExcelProperty("明盘")
+    private String isOpenCount;
+
     @ExcelProperty("仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExportReqVO.java

@@ -21,6 +21,9 @@ public class CountJobMainExportReqVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainPageReqVO.java

@@ -26,6 +26,9 @@ public class CountJobMainPageReqVO extends PageParam {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java

@@ -86,7 +86,7 @@ public class CountPlanMainBaseVO {
     @Schema(description = "盘点负库存")
     private String isCountNegativeInventory;
 
-    @Schema(description = "明盘", example = "2367")
+    @Schema(description = "明盘", example = "TRUE")
     private String isOpenCount;
 
     @Schema(description = "是否可用")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainBaseVO.java

@@ -1,16 +1,11 @@
 package com.win.module.wms.controller.countRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -35,6 +30,9 @@ public class CountRecordMainBaseVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -32,6 +33,9 @@ public class CountRecordMainExcelVO {
     @DictFormat(DictTypeConstants.COUNT_STAGE)
     private String stage;
 
+    @ExcelProperty("明盘")
+    private String isOpenCount;
+
     @ExcelProperty("仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExportReqVO.java

@@ -1,12 +1,11 @@
 package com.win.module.wms.controller.countRecord.vo;
 
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
-import java.time.LocalDateTime;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 盘点记录主 Excel 导出 Request VO，参数和 CountRecordMainPageReqVO 是一致的")
@@ -25,6 +24,9 @@ public class CountRecordMainExportReqVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainPageReqVO.java

@@ -1,10 +1,12 @@
 package com.win.module.wms.controller.countRecord.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -30,6 +32,9 @@ public class CountRecordMainPageReqVO extends PageParam {
     @Schema(description = "仓库代码")
     private String warehouseCode;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "出库事务类型")
     private String outTransactionType;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java

@@ -26,6 +26,9 @@ public class CountRequestMainBaseVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -25,6 +26,9 @@ public class CountRequestMainExcelVO {
     @DictFormat(DictTypeConstants.COUNT_STAGE)
     private String stage;
 
+    @ExcelProperty("明盘")
+    private String isOpenCount;
+
     @ExcelProperty("仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExportReqVO.java

@@ -18,6 +18,9 @@ public class CountRequestMainExportReqVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainPageReqVO.java

@@ -23,6 +23,9 @@ public class CountRequestMainPageReqVO extends PageParam {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java

@@ -41,6 +41,10 @@ public class CountJobMainDO extends BaseDO {
      * 枚举 {@link TODO count_stage 对应的类}
      */
     private String stage;
+    /**
+     * 明盘
+     */
+    private String isOpenCount;
     /**
      * 仓库代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordMainDO.java

@@ -1,14 +1,12 @@
 package com.win.module.wms.dal.dataobject.countRecord;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 盘点记录主 DO
@@ -47,6 +45,10 @@ public class CountRecordMainDO extends BaseDO {
      * 枚举 {@link TODO count_stage 对应的类}
      */
     private String stage;
+    /**
+     * 明盘
+     */
+    private String isOpenCount;
     /**
      * 仓库代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java

@@ -37,6 +37,10 @@ public class CountRequestMainDO extends BaseDO {
      * 枚举 {@link TODO count_stage 对应的类}
      */
     private String stage;
+    /**
+     * 明盘
+     */
+    private String isOpenCount;
     /**
      * 仓库代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java

@@ -27,6 +27,7 @@ public interface CountJobMainMapper extends BaseMapperX<CountJobMainDO> {
                 .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(CountJobMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountJobMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountJobMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountJobMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountJobMainDO::getLocationCode, reqVO.getLocationCode())
                 .betweenIfPresent(CountJobMainDO::getRequestTime, reqVO.getRequestTime())
@@ -79,6 +80,7 @@ public interface CountJobMainMapper extends BaseMapperX<CountJobMainDO> {
                 .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(CountJobMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountJobMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountJobMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountJobMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountJobMainDO::getLocationCode, reqVO.getLocationCode())
                 .betweenIfPresent(CountJobMainDO::getRequestTime, reqVO.getRequestTime())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java

@@ -26,6 +26,7 @@ public interface CountRecordMainMapper extends BaseMapperX<CountRecordMainDO> {
                 .eqIfPresent(CountRecordMainDO::getJobNumber, reqVO.getJobNumber())
                 .eqIfPresent(CountRecordMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountRecordMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountRecordMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountRecordMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType())
                 .eqIfPresent(CountRecordMainDO::getInTransactionType, reqVO.getInTransactionType())
@@ -41,8 +42,7 @@ public interface CountRecordMainMapper extends BaseMapperX<CountRecordMainDO> {
                 .eqIfPresent(CountRecordMainDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountRecordMainDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CountRecordMainDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable())
-                .orderByDesc(CountRecordMainDO::getId));
+                .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable()));
     }
     default PageResult<CountRecordMainDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
@@ -53,6 +53,7 @@ public interface CountRecordMainMapper extends BaseMapperX<CountRecordMainDO> {
                 .eqIfPresent(CountRecordMainDO::getJobNumber, reqVO.getJobNumber())
                 .eqIfPresent(CountRecordMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountRecordMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountRecordMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountRecordMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType())
                 .eqIfPresent(CountRecordMainDO::getInTransactionType, reqVO.getInTransactionType())
@@ -68,8 +69,7 @@ public interface CountRecordMainMapper extends BaseMapperX<CountRecordMainDO> {
                 .eqIfPresent(CountRecordMainDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountRecordMainDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CountRecordMainDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable())
-                .orderByDesc(CountRecordMainDO::getId));
+                .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable()));
     }
 
     default List<CountRecordMainDO> selectList(CustomConditions conditions) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java

@@ -25,6 +25,7 @@ public interface CountRequestMainMapper extends BaseMapperX<CountRequestMainDO>
         return selectPage(reqVO, new LambdaQueryWrapperX<CountRequestMainDO>()
                 .eqIfPresent(CountRequestMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountRequestMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountRequestMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountRequestMainDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CountRequestMainDO::getBusinessType, reqVO.getBusinessType())
@@ -40,8 +41,7 @@ public interface CountRequestMainMapper extends BaseMapperX<CountRequestMainDO>
                 .eqIfPresent(CountRequestMainDO::getAutoCommit, reqVO.getAutoCommit())
                 .eqIfPresent(CountRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CountRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
-                .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
-                .orderByDesc(CountRequestMainDO::getId));
+                .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()));
     }
 
     default CountRequestMainDO selectByPlanNumber(String planNumber) {
@@ -65,6 +65,7 @@ public interface CountRequestMainMapper extends BaseMapperX<CountRequestMainDO>
         return selectList(new LambdaQueryWrapperX<CountRequestMainDO>()
                 .eqIfPresent(CountRequestMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountRequestMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountRequestMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountRequestMainDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CountRequestMainDO::getBusinessType, reqVO.getBusinessType())
@@ -80,8 +81,7 @@ public interface CountRequestMainMapper extends BaseMapperX<CountRequestMainDO>
                 .eqIfPresent(CountRequestMainDO::getAutoCommit, reqVO.getAutoCommit())
                 .eqIfPresent(CountRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CountRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
-                .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
-                .orderByDesc(CountRequestMainDO::getId));
+                .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()));
     }
 
     default List<CountRequestMainDO> selectList(CustomConditions conditions) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java

@@ -0,0 +1,23 @@
+package com.win.module.wms.job;
+
+import com.win.framework.quartz.core.handler.JobHandler;
+import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO;
+import com.win.module.wms.service.countPlan.CountPlanMainService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class CountPlanJob implements JobHandler {
+
+    @Resource
+    private CountPlanMainService countPlanMainService;
+
+    @Override
+    public String execute(String param) {
+        CountPlanMainDO countPlanMainDO = countPlanMainService.getCountPlanMain(Long.parseLong(param));
+        countPlanMainService.generateRequest(countPlanMainDO);
+        return "盘点计划 " + countPlanMainDO.getNumber()+ " 生成了盘点申请";
+    }
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java

@@ -139,4 +139,9 @@ public interface CountPlanMainService {
      */
     Integer resettingCountPlanMain(Long id);
 
+    /**
+     * 生成盘点申请
+     * @param mainDO 盘点申请主
+     */
+    void generateRequest(CountPlanMainDO mainDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.exception.ServiceException;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
+import com.win.framework.quartz.core.scheduler.SchedulerManager;
+import com.win.framework.quartz.core.util.CronUtils;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
@@ -33,6 +35,7 @@ import com.win.module.wms.service.countRequest.CountRequestMainService;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.util.JobUtils;
+import org.quartz.SchedulerException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,6 +47,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.module.infra.enums.ErrorCodeConstants.JOB_CRON_EXPRESSION_VALID;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;
 
 /**
@@ -75,9 +79,16 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
     private CountRequestMainService countRequestMainService;
     @Resource
     private LocationService locationService;
+    @Resource
+    private SchedulerManager schedulerManager;
 
     @Override
     public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) {
+        if(!createReqVO.getType().equals("MANUAL")) {
+            if (!CronUtils.isValid(createReqVO.getCrontab())) {
+                throw exception(JOB_CRON_EXPRESSION_VALID);
+            }
+        }
         // 插入
         CountPlanMainDO countPlanMain = CountPlanMainConvert.INSTANCE.convert(createReqVO);
         String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_PLAN.getCode());
@@ -262,7 +273,16 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
         }
         mainDO.setStatus(planStatusState.getState().getCode());//增加操作记录
         trendsApi.createTrends(id, "countPlan", "发布了盘点计划", TrendsTypeEnum.UPDATE);
-        this.generateRequest(mainDO);
+        if(mainDO.getType().equals("MANUAL")) {//指定盘点
+            this.generateRequest(mainDO);
+        } else if (mainDO.getType().equals("CYCLE")) {//循环盘点
+            // 添加 Job 到 Quartz 中
+            try {
+                schedulerManager.addJob(mainDO.getId() + 10000, "countPlanJob", String.valueOf(mainDO.getId()), mainDO.getCrontab(), 3, 60*10);
+            } catch (SchedulerException e) {
+                throw new ServiceException(COUNT_PLAN_CRON_ERROR);
+            }
+        }
         return countPlanMainMapper.updateById(mainDO);
     }
 
@@ -285,7 +305,8 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
      * 生成盘点申请
      * @param mainDO 盘点申请主
      */
-    private void generateRequest(CountPlanMainDO mainDO) {
+    @Override
+    public void generateRequest(CountPlanMainDO mainDO) {
         List<CountPlanDetailDO> detailDOList = countPlanDetailMapper.selectList(mainDO.getId());
         List<BalanceDO> balanceDOList = this.getBalanceDOList(detailDOList);
         CountRequestMainCreateReqVO countRequestMainCreateReqVO = new CountRequestMainCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@@ -402,16 +402,13 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countJobMainMapper.insert(countJobMainDO);
             List<CountJobDetailDO> countJobDetailDOList = new ArrayList<>();
             List<CountRequestDetailDO> countRequestDetailDOList = listMap.get(mapKey);
-            int countDetailNumber = 1;
             for (CountRequestDetailDO countRequestDetailDO : countRequestDetailDOList) {
                 //空库位时itemCode为空，不加入子表
                 if(countRequestDetailDO.getItemCode() != null && !countRequestDetailDO.getItemCode().isEmpty()) {
                     CountJobDetailDO countJobDetailDO = CountJobDetailConvert.INSTANCE.convert(countRequestDetailDO);
-                    countJobDetailDO.setCountDetailNumber(String.valueOf(countDetailNumber));
                     countJobDetailDO.setNumber(number);
                     countJobDetailDO.setMasterId(countJobMainDO.getId());
                     countJobDetailDOList.add(countJobDetailDO);
-                    countDetailNumber++;
                 }
             }
             if(!countJobDetailDOList.isEmpty()) {

win-server/src/main/resources/application.yaml

@@ -148,6 +148,7 @@ win:
       - /admin-api/infra/file/*/get/** # 获取图片，和租户无关
       - /magic/web/* # magic-api 和租户无关
       - /magic-api/* # magic-api 和租户无关
+      - profile/* # 静态资源 和租户无关
     ignore-tables:
       - system_tenant
       - system_tenant_package