BJ_ZTEITS-Developers / parking-cloud-yudao

Commit d1b20eebaa0a03eae0224e5165602a998f4b1009

Authored by YunaiV
1 parent 86d760fd

feat（wms）：增加 order_time 单据字段

Inline Side-by-side
Showing 35 changed files with 93 additions and 40 deletions
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailRespVO.java
  View file @d1b20ee
@@ -61,9 +61,6 @@ public class WmsCheckOrderDetailRespVO { @@ -61,9 +61,6 @@ public class WmsCheckOrderDetailRespVO {
61 @Schema(description = "金额", example = "1000.00") 61 @Schema(description = "金额", example = "1000.00")
62 private BigDecimal amount; 62 private BigDecimal amount;
63 63
64 - @Schema(description = "备注", example = "备注")  
65 - private String remark;  
66 -  
67 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) 64 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
68 private LocalDateTime createTime; 65 private LocalDateTime createTime;
69 66
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailSaveReqVO.java
  View file @d1b20ee
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.check.vo.detail; @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.check.vo.detail;
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import jakarta.validation.constraints.DecimalMin; 4 import jakarta.validation.constraints.DecimalMin;
5 import jakarta.validation.constraints.NotNull; 5 import jakarta.validation.constraints.NotNull;
6 -import jakarta.validation.constraints.Size;  
7 import lombok.Data; 6 import lombok.Data;
8 7
9 import java.math.BigDecimal; 8 import java.math.BigDecimal;
@@ -40,8 +39,4 @@ public class WmsCheckOrderDetailSaveReqVO { @@ -40,8 +39,4 @@ public class WmsCheckOrderDetailSaveReqVO {
40 @DecimalMin(value = "0", message = "金额不能小于 0") 39 @DecimalMin(value = "0", message = "金额不能小于 0")
41 private BigDecimal amount; 40 private BigDecimal amount;
42 41
43 - @Schema(description = "备注", example = "备注")  
44 - @Size(max = 255, message = "备注长度不能超过 255 个字符")  
45 - private String remark;  
46 -  
47 } 42 }
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderPageReqVO.java
  View file @d1b20ee
@@ -32,7 +32,7 @@ public class WmsCheckOrderPageReqVO extends PageParam { @@ -32,7 +32,7 @@ public class WmsCheckOrderPageReqVO extends PageParam {
32 32
33 @Schema(description = "单据日期") 33 @Schema(description = "单据日期")
34 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 34 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35 - private LocalDateTime[] orderDate; 35 + private LocalDateTime[] orderTime;
36 36
37 @Schema(description = "最小盈亏数量", example = "-10.00") 37 @Schema(description = "最小盈亏数量", example = "-10.00")
38 private BigDecimal totalQuantityMin; 38 private BigDecimal totalQuantityMin;
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderRespVO.java
  View file @d1b20ee
@@ -25,6 +25,10 @@ public class WmsCheckOrderRespVO { @@ -25,6 +25,10 @@ public class WmsCheckOrderRespVO {
25 @ExcelProperty("盘库单号") 25 @ExcelProperty("盘库单号")
26 private String no; 26 private String no;
27 27
  28 + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED)
  29 + @ExcelProperty("单据日期")
  30 + private LocalDateTime orderTime;
  31 +
28 @Schema(description = "盘库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") 32 @Schema(description = "盘库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
29 @ExcelProperty(value = "盘库状态", converter = DictConvert.class) 33 @ExcelProperty(value = "盘库状态", converter = DictConvert.class)
30 @DictFormat(DictTypeConstants.ORDER_STATUS) 34 @DictFormat(DictTypeConstants.ORDER_STATUS)
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderSaveReqVO.java
  View file @d1b20ee
@@ -9,6 +9,7 @@ import jakarta.validation.constraints.Size; @@ -9,6 +9,7 @@ import jakarta.validation.constraints.Size;
9 import lombok.Data; 9 import lombok.Data;
10 10
11 import java.math.BigDecimal; 11 import java.math.BigDecimal;
  12 +import java.time.LocalDateTime;
12 import java.util.List; 13 import java.util.List;
13 14
14 @Schema(description = "管理后台 - WMS 盘库单保存 Request VO") 15 @Schema(description = "管理后台 - WMS 盘库单保存 Request VO")
@@ -23,6 +24,10 @@ public class WmsCheckOrderSaveReqVO { @@ -23,6 +24,10 @@ public class WmsCheckOrderSaveReqVO {
23 @Size(max = 64, message = "盘库单号长度不能超过 64 个字符") 24 @Size(max = 64, message = "盘库单号长度不能超过 64 个字符")
24 private String no; 25 private String no;
25 26
  27 + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED)
  28 + @NotNull(message = "单据日期不能为空")
  29 + private LocalDateTime orderTime;
  30 +
26 @Schema(description = "备注", example = "备注") 31 @Schema(description = "备注", example = "备注")
27 @Size(max = 255, message = "备注长度不能超过 255 个字符") 32 @Size(max = 255, message = "备注长度不能超过 255 个字符")
28 private String remark; 33 private String remark;
@@ -35,7 +40,8 @@ public class WmsCheckOrderSaveReqVO { @@ -35,7 +40,8 @@ public class WmsCheckOrderSaveReqVO {
35 @NotNull(message = "盈亏数量不能为空") 40 @NotNull(message = "盈亏数量不能为空")
36 private BigDecimal totalQuantity; 41 private BigDecimal totalQuantity;
37 42
38 - @Schema(description = "总金额", example = "1000.00") 43 + @Schema(description = "总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000.00")
  44 + @NotNull(message = "总金额不能为空")
39 private BigDecimal totalAmount; 45 private BigDecimal totalAmount;
40 46
41 @Schema(description = "盘库明细") 47 @Schema(description = "盘库明细")
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderPageReqVO.java
  View file @d1b20ee
@@ -35,7 +35,7 @@ public class WmsMovementOrderPageReqVO extends PageParam { @@ -35,7 +35,7 @@ public class WmsMovementOrderPageReqVO extends PageParam {
35 35
36 @Schema(description = "单据日期") 36 @Schema(description = "单据日期")
37 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 37 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38 - private LocalDateTime[] orderDate; 38 + private LocalDateTime[] orderTime;
39 39
40 @Schema(description = "最小数量", example = "1.00") 40 @Schema(description = "最小数量", example = "1.00")
41 private BigDecimal totalQuantityMin; 41 private BigDecimal totalQuantityMin;
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderRespVO.java
  View file @d1b20ee
@@ -25,6 +25,10 @@ public class WmsMovementOrderRespVO { @@ -25,6 +25,10 @@ public class WmsMovementOrderRespVO {
25 @ExcelProperty("移库单号") 25 @ExcelProperty("移库单号")
26 private String no; 26 private String no;
27 27
  28 + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED)
  29 + @ExcelProperty("单据日期")
  30 + private LocalDateTime orderTime;
  31 +
28 @Schema(description = "移库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") 32 @Schema(description = "移库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
29 @ExcelProperty(value = "移库状态", converter = DictConvert.class) 33 @ExcelProperty(value = "移库状态", converter = DictConvert.class)
30 @DictFormat(DictTypeConstants.ORDER_STATUS) 34 @DictFormat(DictTypeConstants.ORDER_STATUS)
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderSaveReqVO.java
  View file @d1b20ee
@@ -9,6 +9,7 @@ import jakarta.validation.constraints.Size; @@ -9,6 +9,7 @@ import jakarta.validation.constraints.Size;
9 import lombok.Data; 9 import lombok.Data;
10 10
11 import java.math.BigDecimal; 11 import java.math.BigDecimal;
  12 +import java.time.LocalDateTime;
12 import java.util.List; 13 import java.util.List;
13 14
14 @Schema(description = "管理后台 - WMS 移库单保存 Request VO") 15 @Schema(description = "管理后台 - WMS 移库单保存 Request VO")
@@ -23,6 +24,10 @@ public class WmsMovementOrderSaveReqVO { @@ -23,6 +24,10 @@ public class WmsMovementOrderSaveReqVO {
23 @Size(max = 64, message = "移库单号长度不能超过 64 个字符") 24 @Size(max = 64, message = "移库单号长度不能超过 64 个字符")
24 private String no; 25 private String no;
25 26
  27 + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED)
  28 + @NotNull(message = "单据日期不能为空")
  29 + private LocalDateTime orderTime;
  30 +
26 @Schema(description = "备注", example = "备注") 31 @Schema(description = "备注", example = "备注")
27 @Size(max = 255, message = "备注长度不能超过 255 个字符") 32 @Size(max = 255, message = "备注长度不能超过 255 个字符")
28 private String remark; 33 private String remark;
@@ -39,7 +44,8 @@ public class WmsMovementOrderSaveReqVO { @@ -39,7 +44,8 @@ public class WmsMovementOrderSaveReqVO {
39 @NotNull(message = "移库数量不能为空") 44 @NotNull(message = "移库数量不能为空")
40 private BigDecimal totalQuantity; 45 private BigDecimal totalQuantity;
41 46
42 - @Schema(description = "总金额", example = "1000.00") 47 + @Schema(description = "总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000.00")
  48 + @NotNull(message = "总金额不能为空")
43 private BigDecimal totalAmount; 49 private BigDecimal totalAmount;
44 50
45 @Schema(description = "移库明细") 51 @Schema(description = "移库明细")
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailRespVO.java
  View file @d1b20ee
@@ -49,9 +49,6 @@ public class WmsReceiptOrderDetailRespVO { @@ -49,9 +49,6 @@ public class WmsReceiptOrderDetailRespVO {
49 @Schema(description = "金额", example = "1000.00") 49 @Schema(description = "金额", example = "1000.00")
50 private BigDecimal amount; 50 private BigDecimal amount;
51 51
52 - @Schema(description = "备注", example = "备注")  
53 - private String remark;  
54 -  
55 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) 52 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
56 private LocalDateTime createTime; 53 private LocalDateTime createTime;
57 54
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailSaveReqVO.java
  View file @d1b20ee
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.detail; @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.detail;
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import jakarta.validation.constraints.DecimalMin; 4 import jakarta.validation.constraints.DecimalMin;
5 import jakarta.validation.constraints.NotNull; 5 import jakarta.validation.constraints.NotNull;
6 -import jakarta.validation.constraints.Size;  
7 import lombok.Data; 6 import lombok.Data;
8 7
9 import java.math.BigDecimal; 8 import java.math.BigDecimal;
@@ -28,8 +27,4 @@ public class WmsReceiptOrderDetailSaveReqVO { @@ -28,8 +27,4 @@ public class WmsReceiptOrderDetailSaveReqVO {
28 @DecimalMin(value = "0", message = "金额不能小于 0") 27 @DecimalMin(value = "0", message = "金额不能小于 0")
29 private BigDecimal amount; 28 private BigDecimal amount;
30 29
31 - @Schema(description = "备注", example = "备注")  
32 - @Size(max = 255, message = "备注长度不能超过 255 个字符")  
33 - private String remark;  
34 -  
35 } 30 }
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java
  View file @d1b20ee
@@ -36,7 +36,7 @@ public class WmsReceiptOrderPageReqVO extends PageParam { @@ -36,7 +36,7 @@ public class WmsReceiptOrderPageReqVO extends PageParam {
36 36
37 @Schema(description = "单据日期") 37 @Schema(description = "单据日期")
38 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 38 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
39 - private LocalDateTime[] orderDate; 39 + private LocalDateTime[] orderTime;
40 40
41 @Schema(description = "最小数量", example = "1.00") 41 @Schema(description = "最小数量", example = "1.00")
42 private BigDecimal totalQuantityMin; 42 private BigDecimal totalQuantityMin;
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java
  View file @d1b20ee
@@ -30,6 +30,10 @@ public class WmsReceiptOrderRespVO { @@ -30,6 +30,10 @@ public class WmsReceiptOrderRespVO {
30 @DictFormat(DictTypeConstants.RECEIPT_ORDER_TYPE) 30 @DictFormat(DictTypeConstants.RECEIPT_ORDER_TYPE)
31 private Integer type; 31 private Integer type;
32 32
  33 + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED)
  34 + @ExcelProperty("单据日期")
  35 + private LocalDateTime orderTime;
  36 +
33 @Schema(description = "入库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") 37 @Schema(description = "入库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
34 @ExcelProperty(value = "入库状态", converter = DictConvert.class) 38 @ExcelProperty(value = "入库状态", converter = DictConvert.class)
35 @DictFormat(DictTypeConstants.ORDER_STATUS) 39 @DictFormat(DictTypeConstants.ORDER_STATUS)
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java
  View file @d1b20ee
@@ -11,6 +11,7 @@ import jakarta.validation.constraints.Size; @@ -11,6 +11,7 @@ import jakarta.validation.constraints.Size;
11 import lombok.Data; 11 import lombok.Data;
12 12
13 import java.math.BigDecimal; 13 import java.math.BigDecimal;
  14 +import java.time.LocalDateTime;
14 import java.util.List; 15 import java.util.List;
15 16
16 @Schema(description = "管理后台 - WMS 入库单保存 Request VO") 17 @Schema(description = "管理后台 - WMS 入库单保存 Request VO")
@@ -30,6 +31,10 @@ public class WmsReceiptOrderSaveReqVO { @@ -30,6 +31,10 @@ public class WmsReceiptOrderSaveReqVO {
30 @InEnum(WmsReceiptOrderTypeEnum.class) 31 @InEnum(WmsReceiptOrderTypeEnum.class)
31 private Integer type; 32 private Integer type;
32 33
  34 + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED)
  35 + @NotNull(message = "单据日期不能为空")
  36 + private LocalDateTime orderTime;
  37 +
33 @Schema(description = "业务单号", example = "PO202605110001") 38 @Schema(description = "业务单号", example = "PO202605110001")
34 @Size(max = 64, message = "业务单号长度不能超过 64 个字符") 39 @Size(max = 64, message = "业务单号长度不能超过 64 个字符")
35 private String bizOrderNo; 40 private String bizOrderNo;
@@ -49,7 +54,8 @@ public class WmsReceiptOrderSaveReqVO { @@ -49,7 +54,8 @@ public class WmsReceiptOrderSaveReqVO {
49 @NotNull(message = "入库数量不能为空") 54 @NotNull(message = "入库数量不能为空")
50 private BigDecimal totalQuantity; 55 private BigDecimal totalQuantity;
51 56
52 - @Schema(description = "总金额", example = "1000.00") 57 + @Schema(description = "总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000.00")
  58 + @NotNull(message = "总金额不能为空")
53 private BigDecimal totalAmount; 59 private BigDecimal totalAmount;
54 60
55 @Schema(description = "入库明细") 61 @Schema(description = "入库明细")
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailRespVO.java
  View file @d1b20ee
@@ -49,9 +49,6 @@ public class WmsShipmentOrderDetailRespVO { @@ -49,9 +49,6 @@ public class WmsShipmentOrderDetailRespVO {
49 @Schema(description = "金额", example = "1000.00") 49 @Schema(description = "金额", example = "1000.00")
50 private BigDecimal amount; 50 private BigDecimal amount;
51 51
52 - @Schema(description = "备注", example = "备注")  
53 - private String remark;  
54 -  
55 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) 52 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
56 private LocalDateTime createTime; 53 private LocalDateTime createTime;
57 54
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailSaveReqVO.java
  View file @d1b20ee
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.shipment.vo.detail; @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.shipment.vo.detail;
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import jakarta.validation.constraints.DecimalMin; 4 import jakarta.validation.constraints.DecimalMin;
5 import jakarta.validation.constraints.NotNull; 5 import jakarta.validation.constraints.NotNull;
6 -import jakarta.validation.constraints.Size;  
7 import lombok.Data; 6 import lombok.Data;
8 7
9 import java.math.BigDecimal; 8 import java.math.BigDecimal;
@@ -28,8 +27,4 @@ public class WmsShipmentOrderDetailSaveReqVO { @@ -28,8 +27,4 @@ public class WmsShipmentOrderDetailSaveReqVO {
28 @DecimalMin(value = "0", message = "金额不能小于 0") 27 @DecimalMin(value = "0", message = "金额不能小于 0")
29 private BigDecimal amount; 28 private BigDecimal amount;
30 29
31 - @Schema(description = "备注", example = "备注")  
32 - @Size(max = 255, message = "备注长度不能超过 255 个字符")  
33 - private String remark;  
34 -  
35 } 30 }
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderPageReqVO.java
  View file @d1b20ee
@@ -36,7 +36,7 @@ public class WmsShipmentOrderPageReqVO extends PageParam { @@ -36,7 +36,7 @@ public class WmsShipmentOrderPageReqVO extends PageParam {
36 36
37 @Schema(description = "单据日期") 37 @Schema(description = "单据日期")
38 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 38 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
39 - private LocalDateTime[] orderDate; 39 + private LocalDateTime[] orderTime;
40 40
41 @Schema(description = "最小数量", example = "1.00") 41 @Schema(description = "最小数量", example = "1.00")
42 private BigDecimal totalQuantityMin; 42 private BigDecimal totalQuantityMin;
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderRespVO.java
  View file @d1b20ee
@@ -30,6 +30,10 @@ public class WmsShipmentOrderRespVO { @@ -30,6 +30,10 @@ public class WmsShipmentOrderRespVO {
30 @DictFormat(DictTypeConstants.SHIPMENT_ORDER_TYPE) 30 @DictFormat(DictTypeConstants.SHIPMENT_ORDER_TYPE)
31 private Integer type; 31 private Integer type;
32 32
  33 + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED)
  34 + @ExcelProperty("单据日期")
  35 + private LocalDateTime orderTime;
  36 +
33 @Schema(description = "出库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") 37 @Schema(description = "出库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
34 @ExcelProperty(value = "出库状态", converter = DictConvert.class) 38 @ExcelProperty(value = "出库状态", converter = DictConvert.class)
35 @DictFormat(DictTypeConstants.ORDER_STATUS) 39 @DictFormat(DictTypeConstants.ORDER_STATUS)
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderSaveReqVO.java
  View file @d1b20ee
@@ -11,6 +11,7 @@ import jakarta.validation.constraints.Size; @@ -11,6 +11,7 @@ import jakarta.validation.constraints.Size;
11 import lombok.Data; 11 import lombok.Data;
12 12
13 import java.math.BigDecimal; 13 import java.math.BigDecimal;
  14 +import java.time.LocalDateTime;
14 import java.util.List; 15 import java.util.List;
15 16
16 @Schema(description = "管理后台 - WMS 出库单保存 Request VO") 17 @Schema(description = "管理后台 - WMS 出库单保存 Request VO")
@@ -30,6 +31,10 @@ public class WmsShipmentOrderSaveReqVO { @@ -30,6 +31,10 @@ public class WmsShipmentOrderSaveReqVO {
30 @InEnum(WmsShipmentOrderTypeEnum.class) 31 @InEnum(WmsShipmentOrderTypeEnum.class)
31 private Integer type; 32 private Integer type;
32 33
  34 + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED)
  35 + @NotNull(message = "单据日期不能为空")
  36 + private LocalDateTime orderTime;
  37 +
33 @Schema(description = "业务单号", example = "SO202605110001") 38 @Schema(description = "业务单号", example = "SO202605110001")
34 @Size(max = 64, message = "业务单号长度不能超过 64 个字符") 39 @Size(max = 64, message = "业务单号长度不能超过 64 个字符")
35 private String bizOrderNo; 40 private String bizOrderNo;
@@ -49,7 +54,8 @@ public class WmsShipmentOrderSaveReqVO { @@ -49,7 +54,8 @@ public class WmsShipmentOrderSaveReqVO {
49 @NotNull(message = "出库数量不能为空") 54 @NotNull(message = "出库数量不能为空")
50 private BigDecimal totalQuantity; 55 private BigDecimal totalQuantity;
51 56
52 - @Schema(description = "总金额", example = "1000.00") 57 + @Schema(description = "总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000.00")
  58 + @NotNull(message = "总金额不能为空")
53 private BigDecimal totalAmount; 59 private BigDecimal totalAmount;
54 60
55 @Schema(description = "出库明细") 61 @Schema(description = "出库明细")
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/check/WmsCheckOrderDO.java
  View file @d1b20ee
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
9 import lombok.*; 9 import lombok.*;
10 10
11 import java.math.BigDecimal; 11 import java.math.BigDecimal;
  12 +import java.time.LocalDateTime;
12 13
13 /** 14 /**
14 * WMS 盘库单 DO 15 * WMS 盘库单 DO
@@ -35,6 +36,10 @@ public class WmsCheckOrderDO extends BaseDO { @@ -35,6 +36,10 @@ public class WmsCheckOrderDO extends BaseDO {
35 */ 36 */
36 private String no; 37 private String no;
37 /** 38 /**
  39 + * 单据日期
  40 + */
  41 + private LocalDateTime orderTime;
  42 + /**
38 * 盘库状态 43 * 盘库状态
39 * 44 *
40 * 字典 {@link DictTypeConstants#ORDER_STATUS} 45 * 字典 {@link DictTypeConstants#ORDER_STATUS}
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/movement/WmsMovementOrderDO.java
  View file @d1b20ee
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
9 import lombok.*; 9 import lombok.*;
10 10
11 import java.math.BigDecimal; 11 import java.math.BigDecimal;
  12 +import java.time.LocalDateTime;
12 13
13 /** 14 /**
14 * WMS 移库单 DO 15 * WMS 移库单 DO
@@ -35,6 +36,10 @@ public class WmsMovementOrderDO extends BaseDO { @@ -35,6 +36,10 @@ public class WmsMovementOrderDO extends BaseDO {
35 */ 36 */
36 private String no; 37 private String no;
37 /** 38 /**
  39 + * 单据日期
  40 + */
  41 + private LocalDateTime orderTime;
  42 + /**
38 * 移库状态 43 * 移库状态
39 * 44 *
40 * 字典 {@link DictTypeConstants#ORDER_STATUS} 45 * 字典 {@link DictTypeConstants#ORDER_STATUS}
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java
  View file @d1b20ee
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
11 import lombok.*; 11 import lombok.*;
12 12
13 import java.math.BigDecimal; 13 import java.math.BigDecimal;
  14 +import java.time.LocalDateTime;
14 15
15 /** 16 /**
16 * WMS 入库单 DO 17 * WMS 入库单 DO
@@ -44,6 +45,10 @@ public class WmsReceiptOrderDO extends BaseDO { @@ -44,6 +45,10 @@ public class WmsReceiptOrderDO extends BaseDO {
44 */ 45 */
45 private Integer type; 46 private Integer type;
46 /** 47 /**
  48 + * 单据日期
  49 + */
  50 + private LocalDateTime orderTime;
  51 + /**
47 * 入库状态 52 * 入库状态
48 * 53 *
49 * 字典 {@link DictTypeConstants#ORDER_STATUS} 54 * 字典 {@link DictTypeConstants#ORDER_STATUS}
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/shipment/WmsShipmentOrderDO.java
  View file @d1b20ee
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
11 import lombok.*; 11 import lombok.*;
12 12
13 import java.math.BigDecimal; 13 import java.math.BigDecimal;
  14 +import java.time.LocalDateTime;
14 15
15 /** 16 /**
16 * WMS 出库单 DO 17 * WMS 出库单 DO
@@ -44,6 +45,10 @@ public class WmsShipmentOrderDO extends BaseDO { @@ -44,6 +45,10 @@ public class WmsShipmentOrderDO extends BaseDO {
44 */ 45 */
45 private Integer type; 46 private Integer type;
46 /** 47 /**
  48 + * 单据日期
  49 + */
  50 + private LocalDateTime orderTime;
  51 + /**
47 * 出库状态 52 * 出库状态
48 * 53 *
49 * 字典 {@link DictTypeConstants#ORDER_STATUS} 54 * 字典 {@link DictTypeConstants#ORDER_STATUS}
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/check/WmsCheckOrderMapper.java
  View file @d1b20ee
@@ -20,7 +20,7 @@ public interface WmsCheckOrderMapper extends BaseMapperX<WmsCheckOrderDO> { @@ -20,7 +20,7 @@ public interface WmsCheckOrderMapper extends BaseMapperX<WmsCheckOrderDO> {
20 .likeIfPresent(WmsCheckOrderDO::getNo, reqVO.getNo()) 20 .likeIfPresent(WmsCheckOrderDO::getNo, reqVO.getNo())
21 .eqIfPresent(WmsCheckOrderDO::getStatus, reqVO.getStatus()) 21 .eqIfPresent(WmsCheckOrderDO::getStatus, reqVO.getStatus())
22 .eqIfPresent(WmsCheckOrderDO::getWarehouseId, reqVO.getWarehouseId()) 22 .eqIfPresent(WmsCheckOrderDO::getWarehouseId, reqVO.getWarehouseId())
23 - .betweenIfPresent(WmsCheckOrderDO::getCreateTime, reqVO.getOrderDate()) 23 + .betweenIfPresent(WmsCheckOrderDO::getOrderTime, reqVO.getOrderTime())
24 .geIfPresent(WmsCheckOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin()) 24 .geIfPresent(WmsCheckOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin())
25 .leIfPresent(WmsCheckOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax()) 25 .leIfPresent(WmsCheckOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax())
26 .geIfPresent(WmsCheckOrderDO::getTotalAmount, reqVO.getTotalAmountMin()) 26 .geIfPresent(WmsCheckOrderDO::getTotalAmount, reqVO.getTotalAmountMin())
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/movement/WmsMovementOrderMapper.java
  View file @d1b20ee
@@ -21,7 +21,7 @@ public interface WmsMovementOrderMapper extends BaseMapperX<WmsMovementOrderDO> @@ -21,7 +21,7 @@ public interface WmsMovementOrderMapper extends BaseMapperX<WmsMovementOrderDO>
21 .eqIfPresent(WmsMovementOrderDO::getStatus, reqVO.getStatus()) 21 .eqIfPresent(WmsMovementOrderDO::getStatus, reqVO.getStatus())
22 .eqIfPresent(WmsMovementOrderDO::getSourceWarehouseId, reqVO.getSourceWarehouseId()) 22 .eqIfPresent(WmsMovementOrderDO::getSourceWarehouseId, reqVO.getSourceWarehouseId())
23 .eqIfPresent(WmsMovementOrderDO::getTargetWarehouseId, reqVO.getTargetWarehouseId()) 23 .eqIfPresent(WmsMovementOrderDO::getTargetWarehouseId, reqVO.getTargetWarehouseId())
24 - .betweenIfPresent(WmsMovementOrderDO::getCreateTime, reqVO.getOrderDate()) 24 + .betweenIfPresent(WmsMovementOrderDO::getOrderTime, reqVO.getOrderTime())
25 .geIfPresent(WmsMovementOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin()) 25 .geIfPresent(WmsMovementOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin())
26 .leIfPresent(WmsMovementOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax()) 26 .leIfPresent(WmsMovementOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax())
27 .geIfPresent(WmsMovementOrderDO::getTotalAmount, reqVO.getTotalAmountMin()) 27 .geIfPresent(WmsMovementOrderDO::getTotalAmount, reqVO.getTotalAmountMin())
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/receipt/WmsReceiptOrderMapper.java
  View file @d1b20ee
@@ -21,7 +21,7 @@ public interface WmsReceiptOrderMapper extends BaseMapperX<WmsReceiptOrderDO> { @@ -21,7 +21,7 @@ public interface WmsReceiptOrderMapper extends BaseMapperX<WmsReceiptOrderDO> {
21 .eqIfPresent(WmsReceiptOrderDO::getStatus, reqVO.getStatus()) 21 .eqIfPresent(WmsReceiptOrderDO::getStatus, reqVO.getStatus())
22 .eqIfPresent(WmsReceiptOrderDO::getWarehouseId, reqVO.getWarehouseId()) 22 .eqIfPresent(WmsReceiptOrderDO::getWarehouseId, reqVO.getWarehouseId())
23 .eqIfPresent(WmsReceiptOrderDO::getMerchantId, reqVO.getMerchantId()) 23 .eqIfPresent(WmsReceiptOrderDO::getMerchantId, reqVO.getMerchantId())
24 - .betweenIfPresent(WmsReceiptOrderDO::getCreateTime, reqVO.getOrderDate()) 24 + .betweenIfPresent(WmsReceiptOrderDO::getOrderTime, reqVO.getOrderTime())
25 .geIfPresent(WmsReceiptOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin()) 25 .geIfPresent(WmsReceiptOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin())
26 .leIfPresent(WmsReceiptOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax()) 26 .leIfPresent(WmsReceiptOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax())
27 .geIfPresent(WmsReceiptOrderDO::getTotalAmount, reqVO.getTotalAmountMin()) 27 .geIfPresent(WmsReceiptOrderDO::getTotalAmount, reqVO.getTotalAmountMin())
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/shipment/WmsShipmentOrderMapper.java
  View file @d1b20ee
@@ -21,7 +21,7 @@ public interface WmsShipmentOrderMapper extends BaseMapperX<WmsShipmentOrderDO> @@ -21,7 +21,7 @@ public interface WmsShipmentOrderMapper extends BaseMapperX<WmsShipmentOrderDO>
21 .eqIfPresent(WmsShipmentOrderDO::getStatus, reqVO.getStatus()) 21 .eqIfPresent(WmsShipmentOrderDO::getStatus, reqVO.getStatus())
22 .eqIfPresent(WmsShipmentOrderDO::getWarehouseId, reqVO.getWarehouseId()) 22 .eqIfPresent(WmsShipmentOrderDO::getWarehouseId, reqVO.getWarehouseId())
23 .eqIfPresent(WmsShipmentOrderDO::getMerchantId, reqVO.getMerchantId()) 23 .eqIfPresent(WmsShipmentOrderDO::getMerchantId, reqVO.getMerchantId())
24 - .betweenIfPresent(WmsShipmentOrderDO::getCreateTime, reqVO.getOrderDate()) 24 + .betweenIfPresent(WmsShipmentOrderDO::getOrderTime, reqVO.getOrderTime())
25 .geIfPresent(WmsShipmentOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin()) 25 .geIfPresent(WmsShipmentOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin())
26 .leIfPresent(WmsShipmentOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax()) 26 .leIfPresent(WmsShipmentOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax())
27 .geIfPresent(WmsShipmentOrderDO::getTotalAmount, reqVO.getTotalAmountMin()) 27 .geIfPresent(WmsShipmentOrderDO::getTotalAmount, reqVO.getTotalAmountMin())
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderDetailServiceImplTest.java
  View file @d1b20ee
@@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import;
12 import org.springframework.test.context.bean.override.mockito.MockitoBean; 12 import org.springframework.test.context.bean.override.mockito.MockitoBean;
13 13
14 import java.math.BigDecimal; 14 import java.math.BigDecimal;
  15 +import java.time.LocalDateTime;
15 import java.util.Arrays; 16 import java.util.Arrays;
16 import java.util.List; 17 import java.util.List;
17 18
@@ -118,6 +119,7 @@ public class WmsCheckOrderDetailServiceImplTest extends BaseDbUnitTest { @@ -118,6 +119,7 @@ public class WmsCheckOrderDetailServiceImplTest extends BaseDbUnitTest {
118 119
119 private static WmsCheckOrderSaveReqVO createCheckOrderReqVO(WmsCheckOrderDetailSaveReqVO... details) { 120 private static WmsCheckOrderSaveReqVO createCheckOrderReqVO(WmsCheckOrderDetailSaveReqVO... details) {
120 WmsCheckOrderSaveReqVO reqVO = new WmsCheckOrderSaveReqVO(); 121 WmsCheckOrderSaveReqVO reqVO = new WmsCheckOrderSaveReqVO();
  122 + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0));
121 reqVO.setWarehouseId(100L); 123 reqVO.setWarehouseId(100L);
122 reqVO.setDetails(Arrays.asList(details)); 124 reqVO.setDetails(Arrays.asList(details));
123 return reqVO; 125 return reqVO;
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderServiceImplTest.java
  View file @d1b20ee
@@ -18,6 +18,7 @@ import org.springframework.context.annotation.Import; @@ -18,6 +18,7 @@ import org.springframework.context.annotation.Import;
18 import org.springframework.test.context.bean.override.mockito.MockitoBean; 18 import org.springframework.test.context.bean.override.mockito.MockitoBean;
19 19
20 import java.math.BigDecimal; 20 import java.math.BigDecimal;
  21 +import java.time.LocalDateTime;
21 22
22 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 23 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
23 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.CHECK_ORDER_DETAIL_REQUIRED; 24 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.CHECK_ORDER_DETAIL_REQUIRED;
@@ -153,6 +154,7 @@ public class WmsCheckOrderServiceImplTest extends BaseDbUnitTest { @@ -153,6 +154,7 @@ public class WmsCheckOrderServiceImplTest extends BaseDbUnitTest {
153 private static WmsCheckOrderDO createCheckOrder(Long warehouseId) { 154 private static WmsCheckOrderDO createCheckOrder(Long warehouseId) {
154 return new WmsCheckOrderDO() 155 return new WmsCheckOrderDO()
155 .setNo("PK202605120001") 156 .setNo("PK202605120001")
  157 + .setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0))
156 .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) 158 .setStatus(WmsOrderStatusEnum.PREPARE.getStatus())
157 .setWarehouseId(warehouseId) 159 .setWarehouseId(warehouseId)
158 .setTotalQuantity(new BigDecimal("-3.00")) 160 .setTotalQuantity(new BigDecimal("-3.00"))
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderDetailServiceImplTest.java
  View file @d1b20ee
@@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import;
12 import org.springframework.test.context.bean.override.mockito.MockitoBean; 12 import org.springframework.test.context.bean.override.mockito.MockitoBean;
13 13
14 import java.math.BigDecimal; 14 import java.math.BigDecimal;
  15 +import java.time.LocalDateTime;
15 import java.util.Arrays; 16 import java.util.Arrays;
16 import java.util.List; 17 import java.util.List;
17 18
@@ -118,6 +119,7 @@ public class WmsMovementOrderDetailServiceImplTest extends BaseDbUnitTest { @@ -118,6 +119,7 @@ public class WmsMovementOrderDetailServiceImplTest extends BaseDbUnitTest {
118 119
119 private static WmsMovementOrderSaveReqVO createMovementOrderReqVO(WmsMovementOrderDetailSaveReqVO... details) { 120 private static WmsMovementOrderSaveReqVO createMovementOrderReqVO(WmsMovementOrderDetailSaveReqVO... details) {
120 WmsMovementOrderSaveReqVO reqVO = new WmsMovementOrderSaveReqVO(); 121 WmsMovementOrderSaveReqVO reqVO = new WmsMovementOrderSaveReqVO();
  122 + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0));
121 reqVO.setSourceWarehouseId(100L); 123 reqVO.setSourceWarehouseId(100L);
122 reqVO.setTargetWarehouseId(200L); 124 reqVO.setTargetWarehouseId(200L);
123 reqVO.setDetails(Arrays.asList(details)); 125 reqVO.setDetails(Arrays.asList(details));
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderServiceImplTest.java
  View file @d1b20ee
@@ -19,6 +19,7 @@ import org.springframework.context.annotation.Import; @@ -19,6 +19,7 @@ import org.springframework.context.annotation.Import;
19 import org.springframework.test.context.bean.override.mockito.MockitoBean; 19 import org.springframework.test.context.bean.override.mockito.MockitoBean;
20 20
21 import java.math.BigDecimal; 21 import java.math.BigDecimal;
  22 +import java.time.LocalDateTime;
22 23
23 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 24 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
24 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MOVEMENT_ORDER_DETAIL_REQUIRED; 25 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MOVEMENT_ORDER_DETAIL_REQUIRED;
@@ -150,6 +151,7 @@ public class WmsMovementOrderServiceImplTest extends BaseDbUnitTest { @@ -150,6 +151,7 @@ public class WmsMovementOrderServiceImplTest extends BaseDbUnitTest {
150 private static WmsMovementOrderDO createMovementOrder(Long sourceWarehouseId, Long targetWarehouseId) { 151 private static WmsMovementOrderDO createMovementOrder(Long sourceWarehouseId, Long targetWarehouseId) {
151 return new WmsMovementOrderDO() 152 return new WmsMovementOrderDO()
152 .setNo("YK202605120001") 153 .setNo("YK202605120001")
  154 + .setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0))
153 .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) 155 .setStatus(WmsOrderStatusEnum.PREPARE.getStatus())
154 .setSourceWarehouseId(sourceWarehouseId) 156 .setSourceWarehouseId(sourceWarehouseId)
155 .setTargetWarehouseId(targetWarehouseId) 157 .setTargetWarehouseId(targetWarehouseId)
@@ -172,6 +174,7 @@ public class WmsMovementOrderServiceImplTest extends BaseDbUnitTest { @@ -172,6 +174,7 @@ public class WmsMovementOrderServiceImplTest extends BaseDbUnitTest {
172 private static WmsMovementOrderSaveReqVO createMovementOrderReqVO(Long sourceWarehouseId, Long targetWarehouseId) { 174 private static WmsMovementOrderSaveReqVO createMovementOrderReqVO(Long sourceWarehouseId, Long targetWarehouseId) {
173 WmsMovementOrderSaveReqVO reqVO = new WmsMovementOrderSaveReqVO(); 175 WmsMovementOrderSaveReqVO reqVO = new WmsMovementOrderSaveReqVO();
174 reqVO.setNo("YK202605120001"); 176 reqVO.setNo("YK202605120001");
  177 + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0));
175 reqVO.setSourceWarehouseId(sourceWarehouseId); 178 reqVO.setSourceWarehouseId(sourceWarehouseId);
176 reqVO.setTargetWarehouseId(targetWarehouseId); 179 reqVO.setTargetWarehouseId(targetWarehouseId);
177 reqVO.setTotalQuantity(new BigDecimal("2.00")); 180 reqVO.setTotalQuantity(new BigDecimal("2.00"));
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java
  View file @d1b20ee
@@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import;
12 import org.springframework.test.context.bean.override.mockito.MockitoBean; 12 import org.springframework.test.context.bean.override.mockito.MockitoBean;
13 13
14 import java.math.BigDecimal; 14 import java.math.BigDecimal;
  15 +import java.time.LocalDateTime;
15 import java.util.Arrays; 16 import java.util.Arrays;
16 import java.util.List; 17 import java.util.List;
17 18
@@ -114,6 +115,7 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { @@ -114,6 +115,7 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest {
114 115
115 private static WmsReceiptOrderSaveReqVO createReceiptOrderReqVO(WmsReceiptOrderDetailSaveReqVO... details) { 116 private static WmsReceiptOrderSaveReqVO createReceiptOrderReqVO(WmsReceiptOrderDetailSaveReqVO... details) {
116 WmsReceiptOrderSaveReqVO reqVO = new WmsReceiptOrderSaveReqVO(); 117 WmsReceiptOrderSaveReqVO reqVO = new WmsReceiptOrderSaveReqVO();
  118 + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0));
117 reqVO.setWarehouseId(100L); 119 reqVO.setWarehouseId(100L);
118 reqVO.setDetails(Arrays.asList(details)); 120 reqVO.setDetails(Arrays.asList(details));
119 return reqVO; 121 return reqVO;
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java
  View file @d1b20ee
@@ -20,6 +20,7 @@ import org.springframework.context.annotation.Import; @@ -20,6 +20,7 @@ import org.springframework.context.annotation.Import;
20 import org.springframework.test.context.bean.override.mockito.MockitoBean; 20 import org.springframework.test.context.bean.override.mockito.MockitoBean;
21 21
22 import java.math.BigDecimal; 22 import java.math.BigDecimal;
  23 +import java.time.LocalDateTime;
23 24
24 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
25 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_DETAIL_REQUIRED; 26 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_DETAIL_REQUIRED;
@@ -138,6 +139,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { @@ -138,6 +139,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest {
138 return new WmsReceiptOrderDO() 139 return new WmsReceiptOrderDO()
139 .setNo("RK202605120001") 140 .setNo("RK202605120001")
140 .setType(WmsReceiptOrderTypeEnum.PURCHASE.getType()) 141 .setType(WmsReceiptOrderTypeEnum.PURCHASE.getType())
  142 + .setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0))
141 .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) 143 .setStatus(WmsOrderStatusEnum.PREPARE.getStatus())
142 .setWarehouseId(warehouseId) 144 .setWarehouseId(warehouseId)
143 .setTotalQuantity(new BigDecimal("2.00")) 145 .setTotalQuantity(new BigDecimal("2.00"))
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderDetailServiceImplTest.java
  View file @d1b20ee
@@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import;
12 import org.springframework.test.context.bean.override.mockito.MockitoBean; 12 import org.springframework.test.context.bean.override.mockito.MockitoBean;
13 13
14 import java.math.BigDecimal; 14 import java.math.BigDecimal;
  15 +import java.time.LocalDateTime;
15 import java.util.Arrays; 16 import java.util.Arrays;
16 import java.util.List; 17 import java.util.List;
17 18
@@ -115,6 +116,7 @@ public class WmsShipmentOrderDetailServiceImplTest extends BaseDbUnitTest { @@ -115,6 +116,7 @@ public class WmsShipmentOrderDetailServiceImplTest extends BaseDbUnitTest {
115 116
116 private static WmsShipmentOrderSaveReqVO createShipmentOrderReqVO(WmsShipmentOrderDetailSaveReqVO... details) { 117 private static WmsShipmentOrderSaveReqVO createShipmentOrderReqVO(WmsShipmentOrderDetailSaveReqVO... details) {
117 WmsShipmentOrderSaveReqVO reqVO = new WmsShipmentOrderSaveReqVO(); 118 WmsShipmentOrderSaveReqVO reqVO = new WmsShipmentOrderSaveReqVO();
  119 + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0));
118 reqVO.setWarehouseId(100L); 120 reqVO.setWarehouseId(100L);
119 reqVO.setDetails(Arrays.asList(details)); 121 reqVO.setDetails(Arrays.asList(details));
120 return reqVO; 122 return reqVO;
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderServiceImplTest.java
  View file @d1b20ee
@@ -20,6 +20,7 @@ import org.springframework.context.annotation.Import; @@ -20,6 +20,7 @@ import org.springframework.context.annotation.Import;
20 import org.springframework.test.context.bean.override.mockito.MockitoBean; 20 import org.springframework.test.context.bean.override.mockito.MockitoBean;
21 21
22 import java.math.BigDecimal; 22 import java.math.BigDecimal;
  23 +import java.time.LocalDateTime;
23 24
24 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
25 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.SHIPMENT_ORDER_DETAIL_REQUIRED; 26 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.SHIPMENT_ORDER_DETAIL_REQUIRED;
@@ -138,6 +139,7 @@ public class WmsShipmentOrderServiceImplTest extends BaseDbUnitTest { @@ -138,6 +139,7 @@ public class WmsShipmentOrderServiceImplTest extends BaseDbUnitTest {
138 return new WmsShipmentOrderDO() 139 return new WmsShipmentOrderDO()
139 .setNo("CK202605120001") 140 .setNo("CK202605120001")
140 .setType(WmsShipmentOrderTypeEnum.SALE.getType()) 141 .setType(WmsShipmentOrderTypeEnum.SALE.getType())
  142 + .setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0))
141 .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) 143 .setStatus(WmsOrderStatusEnum.PREPARE.getStatus())
142 .setWarehouseId(warehouseId) 144 .setWarehouseId(warehouseId)
143 .setTotalQuantity(new BigDecimal("2.00")) 145 .setTotalQuantity(new BigDecimal("2.00"))
yudao-module-wms/src/test/resources/sql/create_tables.sql
  View file @d1b20ee
@@ -78,6 +78,7 @@ CREATE TABLE IF NOT EXISTS "wms_receipt_order" ( @@ -78,6 +78,7 @@ CREATE TABLE IF NOT EXISTS "wms_receipt_order" (
78 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 78 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
79 "no" varchar(64) NOT NULL, 79 "no" varchar(64) NOT NULL,
80 "type" int NOT NULL, 80 "type" int NOT NULL,
  81 + "order_time" timestamp NOT NULL,
81 "status" int NOT NULL DEFAULT '0', 82 "status" int NOT NULL DEFAULT '0',
82 "biz_order_no" varchar(64) DEFAULT NULL, 83 "biz_order_no" varchar(64) DEFAULT NULL,
83 "merchant_id" bigint DEFAULT NULL, 84 "merchant_id" bigint DEFAULT NULL,
@@ -96,7 +97,6 @@ CREATE TABLE IF NOT EXISTS "wms_receipt_order" ( @@ -96,7 +97,6 @@ CREATE TABLE IF NOT EXISTS "wms_receipt_order" (
96 97
97 CREATE TABLE IF NOT EXISTS "wms_receipt_order_detail" ( 98 CREATE TABLE IF NOT EXISTS "wms_receipt_order_detail" (
98 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 99 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
99 - "remark" varchar(255) DEFAULT NULL,  
100 "order_id" bigint NOT NULL, 100 "order_id" bigint NOT NULL,
101 "sku_id" bigint NOT NULL, 101 "sku_id" bigint NOT NULL,
102 "warehouse_id" bigint NOT NULL, 102 "warehouse_id" bigint NOT NULL,
@@ -115,6 +115,7 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order" ( @@ -115,6 +115,7 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order" (
115 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 115 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
116 "no" varchar(64) NOT NULL, 116 "no" varchar(64) NOT NULL,
117 "type" int NOT NULL, 117 "type" int NOT NULL,
  118 + "order_time" timestamp NOT NULL,
118 "status" int NOT NULL DEFAULT '0', 119 "status" int NOT NULL DEFAULT '0',
119 "biz_order_no" varchar(64) DEFAULT NULL, 120 "biz_order_no" varchar(64) DEFAULT NULL,
120 "merchant_id" bigint DEFAULT NULL, 121 "merchant_id" bigint DEFAULT NULL,
@@ -133,7 +134,6 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order" ( @@ -133,7 +134,6 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order" (
133 134
134 CREATE TABLE IF NOT EXISTS "wms_shipment_order_detail" ( 135 CREATE TABLE IF NOT EXISTS "wms_shipment_order_detail" (
135 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 136 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
136 - "remark" varchar(255) DEFAULT NULL,  
137 "order_id" bigint NOT NULL, 137 "order_id" bigint NOT NULL,
138 "sku_id" bigint NOT NULL, 138 "sku_id" bigint NOT NULL,
139 "warehouse_id" bigint NOT NULL, 139 "warehouse_id" bigint NOT NULL,
@@ -151,6 +151,7 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order_detail" ( @@ -151,6 +151,7 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order_detail" (
151 CREATE TABLE IF NOT EXISTS "wms_movement_order" ( 151 CREATE TABLE IF NOT EXISTS "wms_movement_order" (
152 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 152 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
153 "no" varchar(64) NOT NULL, 153 "no" varchar(64) NOT NULL,
  154 + "order_time" timestamp NOT NULL,
154 "status" int NOT NULL DEFAULT '0', 155 "status" int NOT NULL DEFAULT '0',
155 "remark" varchar(255) DEFAULT NULL, 156 "remark" varchar(255) DEFAULT NULL,
156 "source_warehouse_id" bigint NOT NULL, 157 "source_warehouse_id" bigint NOT NULL,
@@ -168,7 +169,6 @@ CREATE TABLE IF NOT EXISTS "wms_movement_order" ( @@ -168,7 +169,6 @@ CREATE TABLE IF NOT EXISTS "wms_movement_order" (
168 169
169 CREATE TABLE IF NOT EXISTS "wms_movement_order_detail" ( 170 CREATE TABLE IF NOT EXISTS "wms_movement_order_detail" (
170 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 171 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
171 - "remark" varchar(255) DEFAULT NULL,  
172 "order_id" bigint NOT NULL, 172 "order_id" bigint NOT NULL,
173 "sku_id" bigint NOT NULL, 173 "sku_id" bigint NOT NULL,
174 "source_warehouse_id" bigint NOT NULL, 174 "source_warehouse_id" bigint NOT NULL,
@@ -187,6 +187,7 @@ CREATE TABLE IF NOT EXISTS "wms_movement_order_detail" ( @@ -187,6 +187,7 @@ CREATE TABLE IF NOT EXISTS "wms_movement_order_detail" (
187 CREATE TABLE IF NOT EXISTS "wms_check_order" ( 187 CREATE TABLE IF NOT EXISTS "wms_check_order" (
188 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 188 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
189 "no" varchar(64) NOT NULL, 189 "no" varchar(64) NOT NULL,
  190 + "order_time" timestamp NOT NULL,
190 "status" int NOT NULL DEFAULT '0', 191 "status" int NOT NULL DEFAULT '0',
191 "remark" varchar(255) DEFAULT NULL, 192 "remark" varchar(255) DEFAULT NULL,
192 "warehouse_id" bigint NOT NULL, 193 "warehouse_id" bigint NOT NULL,
@@ -203,7 +204,6 @@ CREATE TABLE IF NOT EXISTS "wms_check_order" ( @@ -203,7 +204,6 @@ CREATE TABLE IF NOT EXISTS "wms_check_order" (
203 204
204 CREATE TABLE IF NOT EXISTS "wms_check_order_detail" ( 205 CREATE TABLE IF NOT EXISTS "wms_check_order_detail" (
205 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 206 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
206 - "remark" varchar(255) DEFAULT NULL,  
207 "order_id" bigint NOT NULL, 207 "order_id" bigint NOT NULL,
208 "sku_id" bigint NOT NULL, 208 "sku_id" bigint NOT NULL,
209 "warehouse_id" bigint NOT NULL, 209 "warehouse_id" bigint NOT NULL,