diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java index 32f0296b0..745d8dbc7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java @@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; import javax.validation.*; import javax.servlet.http.*; +import javax.validation.constraints.NotEmpty; import java.util.*; import java.io.IOException; import com.cf.imes.framework.common.pojo.PageParam; @@ -65,6 +66,7 @@ public class PlanController { return success(planService.cancellation(id)); } + @GetMapping("/get") @Operation(summary = "获得排单") @Parameter(name = "id", description = "排单id", required = true, example = "1024") @@ -96,6 +98,13 @@ public class PlanController { return success(BeanUtils.toBean(pageResult, PlanRespVO.class)); } + @PostMapping("/setSort") + @Operation(summary = "设置排单优先级") + @PreAuthorize("@ss.hasPermission('executor:plan:query')") + public CommonResult setSort(@Valid @NotEmpty(message = "参数不能空") @RequestBody List list) { + return success(planService.setSort(list)); + } + @GetMapping("getNotPlanOrderListPage") @Operation(summary = "获取未排单的板材生产单板材分页列表") @PreAuthorize("@ss.hasPermission('executor:plan:query')") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SortVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SortVO.java new file mode 100644 index 000000000..2f328dbb3 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SortVO.java @@ -0,0 +1,23 @@ +package com.cf.imes.module.executor.controller.admin.plan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; + +/** + * @author Beal + */ +@Data +@Valid +public class SortVO { + @Schema(description = "排单id") + @NotNull(message = "排单id 不能空") + private Long planId; + + @Schema(description = "排序") + @NotNull(message = "排序不能空") + private Long sort; + +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java index 6fed4c162..6246c0034 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java @@ -66,4 +66,6 @@ public interface PlanService { PageResult getOrderByPlanId(PlanOrderPageReqVO pageReqVO); PageResult getNotPlanGoodsListPageByOrderId( NotPlanGoodsListPageVO pageVO); + + Boolean setSort(List list); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index c2fa5b44f..a7b180e1d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -403,4 +403,18 @@ public class PlanServiceImpl implements PlanService { ); } + @Override + public Boolean setSort(List list) { + ArrayList planDOS = new ArrayList<>(); + list.forEach(e->{ + planDOS.add(PlanDO.builder() + .id(e.getPlanId()) + .sort(e.getSort()) + .build()); + + }); + planMapper.updateBatch(planDOS); + return Boolean.TRUE; + } + } \ No newline at end of file