采购计划：问题修改

@@ -37,7 +37,7 @@ public class ProcurementPlanChangeController extends DefaultBaseController {
    * 查询列表
    * 查询列表
    */
    */
   @ApiOperation("查询列表")
   @ApiOperation("查询列表")
-  @HasPermission({"plan-manage:plan-change:query"})
+  @HasPermission({"plan-manage:schedule-plan:query"})
   @GetMapping("/query")
   @GetMapping("/query")
   public InvokeResult<PageResult<ProcurementPlanChange>> query(@Valid QueryProcurementPlanChangeVo vo) {
   public InvokeResult<PageResult<ProcurementPlanChange>> query(@Valid QueryProcurementPlanChangeVo vo) {
     PageResult<ProcurementPlanChange> result = procurementPlanChangeService.query(
     PageResult<ProcurementPlanChange> result = procurementPlanChangeService.query(
@@ -50,7 +50,7 @@ public class ProcurementPlanChangeController extends DefaultBaseController {
    */
    */
   @ApiOperation("查询详情")
   @ApiOperation("查询详情")
   @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
   @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
-  @HasPermission({"plan-manage:plan-change:query","plan-manage:schedule-plan:view"})
+  @HasPermission({"plan-manage:schedule-plan:query","plan-manage:schedule-plan:view"})
   @GetMapping("/findById")
   @GetMapping("/findById")
   public InvokeResult<GetProcurementPlanChangeBo> findById(@NotBlank(message = "ID不能为空！") String id) {
   public InvokeResult<GetProcurementPlanChangeBo> findById(@NotBlank(message = "ID不能为空！") String id) {
     GetProcurementPlanChangeBo result = procurementPlanChangeService.findDetail(id);
     GetProcurementPlanChangeBo result = procurementPlanChangeService.findDetail(id);

@@ -142,7 +142,7 @@ public class ProcurementPlanController extends DefaultBaseController {
    */
    */
   @ApiOperation("根据ID查询")
   @ApiOperation("根据ID查询")
   @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
   @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
-  @HasPermission({"procurement:plan:query"})
+  @HasPermission({"plan-manage:domestic-plan:query"})
   @GetMapping
   @GetMapping
   public InvokeResult<GetProcurementPlanBo> findById(
   public InvokeResult<GetProcurementPlanBo> findById(
       @NotBlank(message = "ID不能为空！") String id) {
       @NotBlank(message = "ID不能为空！") String id) {

@@ -714,9 +714,11 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
 
 
     // 2. 查询当月最大的编号（例如：260100005）
     // 2. 查询当月最大的编号（例如：260100005）
     // 使用 MyBatis-Plus 的 likeRight 进行前缀匹配，确保只查当月的数据
     // 使用 MyBatis-Plus 的 likeRight 进行前缀匹配，确保只查当月的数据
+    // 过滤包含下划线的子计划/归档编号（如 260800001_01、260800001_HIST）：下划线在LIKE中是通配符，需要ESCAPE转义
     ProcurementPlan maxPlan = getBaseMapper().selectOne(
     ProcurementPlan maxPlan = getBaseMapper().selectOne(
             Wrappers.lambdaQuery(ProcurementPlan.class)
             Wrappers.lambdaQuery(ProcurementPlan.class)
                     .likeRight(ProcurementPlan::getCode, datePrefix)
                     .likeRight(ProcurementPlan::getCode, datePrefix)
+                    .apply("code NOT LIKE '%/_%' ESCAPE '/'")
                     .orderByDesc(ProcurementPlan::getCode)
                     .orderByDesc(ProcurementPlan::getCode)
                     .last("LIMIT 1")
                     .last("LIMIT 1")
     );
     );
@@ -737,6 +739,7 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
 
 
     // 4. 拼接最终编号，流水号不足5位左侧补0
     // 4. 拼接最终编号，流水号不足5位左侧补0
     String candidate = datePrefix + String.format("%05d", nextSeq);
     String candidate = datePrefix + String.format("%05d", nextSeq);
+    System.out.println("candidate===" + candidate);
 
 
     // 5. 兜底校验：防止极端并发下出现重复
     // 5. 兜底校验：防止极端并发下出现重复
     Integer count = getBaseMapper().selectCount(
     Integer count = getBaseMapper().selectCount(