diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/ApiResult.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/ApiResult.java index 7a80a52c..4dcbae2c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/ApiResult.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/ApiResult.java @@ -2,8 +2,10 @@ package com.nflg.wms.common.pojo; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nflg.wms.common.constant.Constant; import com.nflg.wms.common.constant.STATE; import lombok.Data; +import org.slf4j.MDC; import java.io.Serializable; import java.time.LocalDateTime; @@ -15,7 +17,8 @@ public class ApiResult implements Serializable { private String type; private String message; private Object extras; - private LocalDateTime time=LocalDateTime.now(); + private LocalDateTime time = LocalDateTime.now(); + private String traceId = MDC.get(Constant.TRACE_ID); private T result; public static ApiResult success(T value) { diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java index 090e5b0e..ae7b7f15 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java @@ -1,5 +1,7 @@ package com.nflg.wms.common.pojo.dto; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.experimental.Accessors; @@ -13,6 +15,7 @@ public class PackageMaterialDTO { /** * 编号 */ + @NotBlank private String no; /** @@ -28,16 +31,19 @@ public class PackageMaterialDTO { /** * 工位 */ + @NotBlank private String station; /** * 托盘 */ + @NotBlank private String tray; /** * 数量 */ + @NotNull private BigDecimal num; /** @@ -52,6 +58,7 @@ public class PackageMaterialDTO { /** * 版本 */ + @NotNull private Integer version; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java index df6bb311..bcaba7af 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java @@ -1,6 +1,7 @@ package com.nflg.wms.common.pojo.qo; import com.nflg.wms.common.pojo.dto.PackageMaterialDTO; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -71,6 +72,7 @@ public class PackageAddQO { /** * 零件清单 */ + @Valid @NotEmpty private List materials; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayVO.java index bdefb38e..30a7e8b2 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayVO.java @@ -37,7 +37,7 @@ public class TrayVO { private String tray; /** - * 状态,0:未打包;1:已打包;2-在途; + * 状态,0:未打包;1:已打包;2-在途;3:已收货 */ private Short state;