调整编号生成逻辑，增加租户标识隔离

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsPlanController.java

@@ -412,7 +412,7 @@ public class FmsPlanController extends BaseController
     @Log(title = "种植计划", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@Valid @RequestBody FmsPlan fmsPlan) {
-        fmsPlan.setPlanNo(noGenerator.getPlanNo());
+        fmsPlan.setPlanNo(noGenerator.getPlanNo(SecurityUtils.getTid()));
         fmsPlan.setPlanStartdate(fmsPlan.getPlanPlanstartdate());
         //根据日期判断状态与生长周期
         String planPlanstartdate = fmsPlan.getPlanPlanstartdate();

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsTaskController.java

@@ -285,7 +285,7 @@ public class FmsTaskController extends BaseController
         fmsTask.setTaskCreator(loginUser.getUserId());
         fmsTask.setTaskAuditor(loginUser.getUserId());
         fmsTask.setTaskCreateddate(LocalDateTime.now().format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        fmsTask.setTaskNo(noGenerator.getTaskNo());
+        fmsTask.setTaskNo(noGenerator.getTaskNo(SecurityUtils.getTid()));
         fmsTask.setTaskStatus(TaskStatus.EXECUTING.getCode());//执行中
         fmsTask.setTaskCreatetype(CommonEnums.TASK_CREATE_TYPE_MOVE.getCode());
         fmsTask.setTaskAudittype(CommonEnums.TASK_AUDIT_TYPE_DOWN.getCode());
@@ -307,7 +307,7 @@ public class FmsTaskController extends BaseController
             FmsTaskpick fmsTaskpick = new FmsTaskpick();
             fmsTaskpick.setTaskId(fmsTask.getTaskId());
             fmsTaskpick.setTaskpickId(fmsTaskpick.getId());
-            fmsTaskpick.setPickNo(noGenerator.getPickNo());
+            fmsTaskpick.setPickNo(noGenerator.getPickNo(SecurityUtils.getTid()));
             //采收面积取采收地块的面积
             FmsBlock block = fmsBlockService.selectFmsBlockByBlockId(reqVo.getBlockId(), SecurityUtils.getTid());
             fmsTaskpick.setPickArea(block.getBlockArea());
@@ -368,7 +368,7 @@ public class FmsTaskController extends BaseController
         fmsTask.setTaskId(fmsTask.getId());
         fmsTask.setTaskCreator(loginUser.getUserId());
         fmsTask.setTaskCreateddate(LocalDateTime.now().format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        fmsTask.setTaskNo(noGenerator.getTaskNo());
+        fmsTask.setTaskNo(noGenerator.getTaskNo(SecurityUtils.getTid()));
         fmsTask.setTaskStatus(TaskStatus.COMPLETED.getCode());//已完成
         fmsTask.setTaskCreatetype(CommonEnums.TASK_CREATE_TYPE_MOVE.getCode());
         fmsTask.setTaskAudittype(CommonEnums.TASK_AUDIT_TYPE_LOG.getCode());
@@ -398,7 +398,7 @@ public class FmsTaskController extends BaseController
             fmsTaskpick.setTaskId(fmsTask.getTaskId());
             fmsTaskpick.setTaskpickId(fmsTaskpick.getId());
             fmsTaskpick.setPickWeight(reqVo.getTaskrcdWeight());
-            fmsTaskpick.setPickNo(noGenerator.getPickNo());
+            fmsTaskpick.setPickNo(noGenerator.getPickNo(SecurityUtils.getTid()));
             fmsTaskpick.setPickDate(fmsTask.getTaskPlanenddate());
             //采收面积取采收地块的面积
             fmsTaskpick.setPickArea(block.getBlockArea());
@@ -468,7 +468,7 @@ public class FmsTaskController extends BaseController
         fmsTask.setTaskId(fmsTask.getId());
         fmsTask.setTaskCreator(loginUser.getUserId());
         fmsTask.setTaskCreateddate(LocalDateTime.now().format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        fmsTask.setTaskNo(noGenerator.getTaskNo());
+        fmsTask.setTaskNo(noGenerator.getTaskNo(SecurityUtils.getTid()));
         fmsTask.setTaskStatus(TaskStatus.UNAUDITED.getCode());//待审核
         fmsTask.setTaskCreatetype(CommonEnums.TASK_CREATE_TYPE_MOVE.getCode());
         fmsTask.setTaskAudittype(CommonEnums.TASK_AUDIT_TYPE_UP.getCode());
@@ -493,7 +493,7 @@ public class FmsTaskController extends BaseController
             fmsTaskpick.setTaskId(fmsTask.getTaskId());
             fmsTaskpick.setTaskpickId(fmsTaskpick.getId());
             fmsTaskpick.setPickWeight(reqVo.getTaskrcdWeight());
-            fmsTaskpick.setPickNo(noGenerator.getPickNo());
+            fmsTaskpick.setPickNo(noGenerator.getPickNo(SecurityUtils.getTid()));
             fmsTaskpick.setPickDate(fmsTask.getTaskPlanenddate());
             //采收面积取采收地块的面积
             FmsBlock block = fmsBlockService.selectFmsBlockByBlockId(reqVo.getBlockId(), SecurityUtils.getTid());

src/main/java/com/yunfeiyun/agmp/fms/controller/WmsWarehouseController.java

@@ -52,6 +52,7 @@ public class WmsWarehouseController extends BaseController
     @PreAuthorize("@ss.hasPermi('wms:warehouse:list')")
     @GetMapping("/list")
     public TableDataInfo list(WmsWarehouseListReqVo wmsWarehouse) {
+        // TODO:SAAS项目暂时不对仓库做权限过滤
         boolean b = SecurityUtils.isValidate();
         if (false) {
             List<String> warehouseIds = dataAuthUtil.getManagerWarehouse();
@@ -146,7 +147,7 @@ public class WmsWarehouseController extends BaseController
     public void export(HttpServletResponse response,@RequestBody WmsWarehouse wmsWarehouse) {
         ExcelUtil<WmsWarehouse> util = new ExcelUtil<WmsWarehouse>(WmsWarehouse.class);
         // boolean b = SecurityUtils.isValidate();
-        // TODO:昌黎项目无需过滤仓库
+        // TODO:SAAS项目暂时不对仓库做权限过滤
         boolean b = false;
         if (b) {
             List<String> warehouseIds = dataAuthUtil.getManagerWarehouse();