Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道Bug416修改

Browse Source
This commit is contained in:
liuzhaotian
2024-10-16 16:05:17 +08:00
parent 266e11c202
commit 4ceb952bf0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java
+5 -5
View File
@@ -6,10 +6,10 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDate;
import java.util.List; 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 * @author there
@@ -42,9 +42,9 @@ public class OrderPageReqVOCopy extends PageParam {
private Boolean twoDimensionalToolPath; private Boolean twoDimensionalToolPath;
@Schema(description = "门板") @Schema(description = "门板")
private Boolean isDoor; private Boolean isDoor;
@Schema(description = "生产单订单日期", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]") @Schema(description = "生产单订单日期", example = "[2022-07-01 ,2022-07-01]")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime[] createTime; private LocalDate[] createTime;
@Schema(description = "长 小范围") @Schema(description = "长 小范围")
private BigDecimal longMinRang; private BigDecimal longMinRang;
@Schema(description = "长 大范围") @Schema(description = "长 大范围")
cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml
+1 -2
View File
@@ -177,8 +177,7 @@
<dependency> <dependency>
<groupId>com.cf.imes</groupId> <groupId>com.cf.imes</groupId>
<artifactId>cf-module-prod-executor-api</artifactId> <artifactId>cf-module-prod-executor-api</artifactId>
<version>2.0.0-jdk8-snapshot</version> <version>${revision}</version>
<scope>compile</scope>
</dependency> </dependency>
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java
+1
View File
@@ -53,6 +53,7 @@ public class CuttingSaveReqVO {
@Schema(description = "机台的型号-机台的ID") @Schema(description = "机台的型号-机台的ID")
@NotNull(message = "机台型号不能为空")
private Long machineId; private Long machineId;