From f3d13533b524d68b8f49d77d58043bce7f75c5ee Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 7 May 2024 16:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=8D=95=E7=9A=84=E5=BF=85=E4=BC=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/PlanController.java | 6 ++++-- .../controller/admin/plan/vo/PlanSaveReqVO.java | 17 +++++++++-------- .../executor/dal/dataobject/plan/PlanDO.java | 2 +- .../executor/service/plan/PlanServiceImpl.java | 4 ++++ 4 files changed, 18 insertions(+), 11 deletions(-) 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 2ace4e865..32f0296b0 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 @@ -1,5 +1,7 @@ package com.cf.imes.module.executor.controller.admin.plan; +import com.cf.imes.framework.es.core.valid.CreateGroup; +import com.cf.imes.framework.es.core.valid.UpdateGroup; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderRespVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -35,14 +37,14 @@ public class PlanController { @PostMapping("/create") @Operation(summary = "创建排单") @PreAuthorize("@ss.hasPermission('executor:plan:create')") - public CommonResult createPlan(@Valid @RequestBody PlanSaveReqVO createReqVO) { + public CommonResult createPlan(@Validated(CreateGroup.class) @RequestBody PlanSaveReqVO createReqVO) { return success(planService.createPlan(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新排单") @PreAuthorize("@ss.hasPermission('executor:plan:update')") - public CommonResult updatePlan(@Valid @RequestBody PlanSaveReqVO updateReqVO) { + public CommonResult updatePlan(@Validated(UpdateGroup.class) @RequestBody PlanSaveReqVO updateReqVO) { planService.updatePlan(updateReqVO); return success(true); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java index dae8ff720..f8e876ff1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.controller.admin.plan.vo; +import com.cf.imes.framework.es.core.valid.CreateGroup; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -18,19 +19,19 @@ public class PlanSaveReqVO { private String planNo; @Schema(description = "排序优先级", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "排序优先级不能为空") - private Integer sort; + //@NotNull(groups = CreateGroup.class,message = "排序优先级不能为空") + private Long sort; @Schema(description = "排单类型：1 混单排单，2 生产单排单", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotNull(message = "排单类型：1 混单排单，2 生产单排单不能为空") + @NotNull(message = "排单类型：1 混单排单，2 生产单排单不能为空", groups = CreateGroup.class) private Integer type; @Schema(description = "排单状态：0 新单，1 板材已申请，2 开料中，3 已开料", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "排单状态：0 新单，1 板材已申请，2 开料中，3 已开料不能为空") + @NotNull(message = "排单状态：0 新单，1 板材已申请，2 开料中，3 已开料不能为空", groups = CreateGroup.class) private Integer status; @Schema(description = "是否支付：0 否，1 是", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否支付：0 否，1 是不能为空") + //@NotNull(message = "是否支付：0 否，1 是不能为空") private Boolean isPay; @Schema(description = "机台 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16707") @@ -38,7 +39,7 @@ public class PlanSaveReqVO { private Long machineId; @Schema(description = "计划时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "计划时间不能为空") + @NotNull(message = "计划时间不能为空", groups = CreateGroup.class) private LocalDateTime planTime; /*@Schema(description = "生产单id列表", requiredMode = Schema.RequiredMode.REQUIRED) @@ -51,10 +52,10 @@ public class PlanSaveReqVO { private String remark; @Schema(description = "生产操作人", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "生产操作人不能为空") + @NotEmpty(message = "生产操作人不能为空", groups = CreateGroup.class) private String operator; @Schema(description = "生产时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生产时间不能为空") + @NotNull(message = "生产时间不能为空", groups = CreateGroup.class) private LocalDateTime produceTime; } \ 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/dal/dataobject/plan/PlanDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java index 9093bed1a..90875b261 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java @@ -36,7 +36,7 @@ public class PlanDO extends BaseDO { /** * 排序优先级 */ - private Integer sort; + private Long sort; /** * 排单类型：1 混单排单，2 生产单排单 */ 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 0e2a506f1..d4a548156 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 @@ -88,7 +88,10 @@ public class PlanServiceImpl implements PlanService { @Transactional(rollbackFor = Exception.class) public Long createPlan(PlanSaveReqVO createReqVO) { // 插入 + long sort = System.currentTimeMillis(); PlanDO plan = BeanUtils.toBean(createReqVO, PlanDO.class); + plan.setIsPay(Boolean.FALSE); + plan.setSort(sort); planMapper.insert(plan); Long planId = plan.getId(); /* List orderIds = createReqVO.getOrderIds(); @@ -124,6 +127,7 @@ public class PlanServiceImpl implements PlanService { validatePlanExists(updateReqVO.getId()); // 更新 PlanDO plan = BeanUtils.toBean(updateReqVO, PlanDO.class); + plan.setIsPay(Boolean.FALSE); planMapper.updateById(plan); Long planId = plan.getId();