禅道Bug416修改

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 = "长 大范围")

cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml

@@ -177,8 +177,7 @@
         <dependency>
             <groupId>com.cf.imes</groupId>
             <artifactId>cf-module-prod-executor-api</artifactId>
-            <version>2.0.0-jdk8-snapshot</version>
-            <scope>compile</scope>
+            <version>${revision}</version>
         </dependency>
 
 

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;