From 4ceb952bf03c54dd642b005f86806ce06dd71386 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 16 Oct 2024 16:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93Bug416=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/vo/OrderPageReqVOCopy.java | 10 +++++----- .../cf-module-prod-manage-biz/pom.xml | 3 +-- .../controller/admin/machine/vo/CuttingSaveReqVO.java | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java index 179594cba..f9ed1e9a7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java @@ -6,10 +6,10 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.util.List; -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; /** * @author there @@ -42,9 +42,9 @@ public class OrderPageReqVOCopy extends PageParam { private Boolean twoDimensionalToolPath; @Schema(description = "门板") private Boolean isDoor; - @Schema(description = "生产单订单日期", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; + @Schema(description = "生产单订单日期", example = "[2022-07-01 ,2022-07-01]") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate[] createTime; @Schema(description = "长 小范围") private BigDecimal longMinRang; @Schema(description = "长 大范围") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml index dc0612047..777b99b49 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml @@ -177,8 +177,7 @@ com.cf.imes cf-module-prod-executor-api - 2.0.0-jdk8-snapshot - compile + ${revision} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java index 22e9d9b4d..0dcbbb6c1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java @@ -53,6 +53,7 @@ public class CuttingSaveReqVO { @Schema(description = "机台的型号-机台的ID") + @NotNull(message = "机台型号不能为空") private Long machineId;