wks 4 сар өмнө
parent
commit
941d380132

+ 2 - 2
ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/TaskController.java

@@ -49,8 +49,8 @@ public class TaskController {
     }
 
     @Operation(summary = "编辑查询")
-    @GetMapping("/id")
-    public R<WmsTaskEditVo> editQuery(String id) {
+    @GetMapping("/{id}")
+    public R<WmsTaskEditVo> editQuery(@PathVariable String id) {
         WmsTaskEditVo wmsTask = wmsTaskService.editQuery(id);
         return R.ok(wmsTask);
     }

+ 10 - 4
ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/dto/WmsTaskQueryDto.java

@@ -1,10 +1,12 @@
 package com.ruoyi.wms.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 @Data
@@ -17,16 +19,20 @@ public class WmsTaskQueryDto implements Serializable {
     private String taskCode;
 
     @Schema(description = "开始时间起")
-    private Date startDateFrom;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDateFrom;
 
     @Schema(description = "开始时间到")
-    private Date startDateTo;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDateTo;
 
     @Schema(description = "开始时间起")
-    private Date endDateFrom;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDateFrom;
 
     @Schema(description = "开始时间到")
-    private Date endDateTo;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDateTo;
 
     @Schema(description = "状态")
     private Integer status;

+ 6 - 6
ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/WmsBomVersion.java

@@ -4,25 +4,24 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import lombok.*;
 
 import java.io.Serial;
-import java.io.Serializable;
 
 /**
  * bom版本
  *
  * @TableName wms_bom_version
  */
+@EqualsAndHashCode(callSuper = true)
 @TableName(value = "wms_bom_version")
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class WmsBomVersion implements Serializable {
+public class WmsBomVersion extends BaseEntity {
+
     @Serial
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -44,4 +43,5 @@ public class WmsBomVersion implements Serializable {
      */
     @TableField(value = "version")
     private String version;
+
 }