diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailRespVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailRespVO.java index 48a9435..a58dfce 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailRespVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailRespVO.java @@ -61,9 +61,6 @@ public class WmsCheckOrderDetailRespVO { @Schema(description = "金额", example = "1000.00") private BigDecimal amount; - @Schema(description = "备注", example = "备注") - private String remark; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailSaveReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailSaveReqVO.java index 15f41ae..22c5082 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailSaveReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/detail/WmsCheckOrderDetailSaveReqVO.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.check.vo.detail; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import lombok.Data; import java.math.BigDecimal; @@ -40,8 +39,4 @@ public class WmsCheckOrderDetailSaveReqVO { @DecimalMin(value = "0", message = "金额不能小于 0") private BigDecimal amount; - @Schema(description = "备注", example = "备注") - @Size(max = 255, message = "备注长度不能超过 255 个字符") - private String remark; - } diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderPageReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderPageReqVO.java index 84a8217..5f8d062 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderPageReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderPageReqVO.java @@ -32,7 +32,7 @@ public class WmsCheckOrderPageReqVO extends PageParam { @Schema(description = "单据日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] orderDate; + private LocalDateTime[] orderTime; @Schema(description = "最小盈亏数量", example = "-10.00") private BigDecimal totalQuantityMin; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderRespVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderRespVO.java index 64f8cb6..7d0d549 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderRespVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderRespVO.java @@ -25,6 +25,10 @@ public class WmsCheckOrderRespVO { @ExcelProperty("盘库单号") private String no; + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("单据日期") + private LocalDateTime orderTime; + @Schema(description = "盘库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") @ExcelProperty(value = "盘库状态", converter = DictConvert.class) @DictFormat(DictTypeConstants.ORDER_STATUS) diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderSaveReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderSaveReqVO.java index e52944e..43488a5 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderSaveReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/check/vo/order/WmsCheckOrderSaveReqVO.java @@ -9,6 +9,7 @@ import jakarta.validation.constraints.Size; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; @Schema(description = "管理后台 - WMS 盘库单保存 Request VO") @@ -23,6 +24,10 @@ public class WmsCheckOrderSaveReqVO { @Size(max = 64, message = "盘库单号长度不能超过 64 个字符") private String no; + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "单据日期不能为空") + private LocalDateTime orderTime; + @Schema(description = "备注", example = "备注") @Size(max = 255, message = "备注长度不能超过 255 个字符") private String remark; @@ -35,7 +40,8 @@ public class WmsCheckOrderSaveReqVO { @NotNull(message = "盈亏数量不能为空") private BigDecimal totalQuantity; - @Schema(description = "总金额", example = "1000.00") + @Schema(description = "总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000.00") + @NotNull(message = "总金额不能为空") private BigDecimal totalAmount; @Schema(description = "盘库明细") diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderPageReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderPageReqVO.java index 38487b8..238ac9a 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderPageReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderPageReqVO.java @@ -35,7 +35,7 @@ public class WmsMovementOrderPageReqVO extends PageParam { @Schema(description = "单据日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] orderDate; + private LocalDateTime[] orderTime; @Schema(description = "最小数量", example = "1.00") private BigDecimal totalQuantityMin; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderRespVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderRespVO.java index 833b05f..f401bd3 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderRespVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderRespVO.java @@ -25,6 +25,10 @@ public class WmsMovementOrderRespVO { @ExcelProperty("移库单号") private String no; + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("单据日期") + private LocalDateTime orderTime; + @Schema(description = "移库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") @ExcelProperty(value = "移库状态", converter = DictConvert.class) @DictFormat(DictTypeConstants.ORDER_STATUS) diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderSaveReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderSaveReqVO.java index c4ddf6c..750bc18 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderSaveReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/movement/vo/order/WmsMovementOrderSaveReqVO.java @@ -9,6 +9,7 @@ import jakarta.validation.constraints.Size; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; @Schema(description = "管理后台 - WMS 移库单保存 Request VO") @@ -23,6 +24,10 @@ public class WmsMovementOrderSaveReqVO { @Size(max = 64, message = "移库单号长度不能超过 64 个字符") private String no; + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "单据日期不能为空") + private LocalDateTime orderTime; + @Schema(description = "备注", example = "备注") @Size(max = 255, message = "备注长度不能超过 255 个字符") private String remark; @@ -39,7 +44,8 @@ public class WmsMovementOrderSaveReqVO { @NotNull(message = "移库数量不能为空") private BigDecimal totalQuantity; - @Schema(description = "总金额", example = "1000.00") + @Schema(description = "总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000.00") + @NotNull(message = "总金额不能为空") private BigDecimal totalAmount; @Schema(description = "移库明细") diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailRespVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailRespVO.java index fe885e3..1376d48 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailRespVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailRespVO.java @@ -49,9 +49,6 @@ public class WmsReceiptOrderDetailRespVO { @Schema(description = "金额", example = "1000.00") private BigDecimal amount; - @Schema(description = "备注", example = "备注") - private String remark; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailSaveReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailSaveReqVO.java index 3b7a918..ca4e7d5 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailSaveReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/detail/WmsReceiptOrderDetailSaveReqVO.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.detail; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import lombok.Data; import java.math.BigDecimal; @@ -28,8 +27,4 @@ public class WmsReceiptOrderDetailSaveReqVO { @DecimalMin(value = "0", message = "金额不能小于 0") private BigDecimal amount; - @Schema(description = "备注", example = "备注") - @Size(max = 255, message = "备注长度不能超过 255 个字符") - private String remark; - } diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java index c607a7b..2440d8d 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java @@ -36,7 +36,7 @@ public class WmsReceiptOrderPageReqVO extends PageParam { @Schema(description = "单据日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] orderDate; + private LocalDateTime[] orderTime; @Schema(description = "最小数量", example = "1.00") private BigDecimal totalQuantityMin; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java index 374ff07..602b90a 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java @@ -30,6 +30,10 @@ public class WmsReceiptOrderRespVO { @DictFormat(DictTypeConstants.RECEIPT_ORDER_TYPE) private Integer type; + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("单据日期") + private LocalDateTime orderTime; + @Schema(description = "入库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") @ExcelProperty(value = "入库状态", converter = DictConvert.class) @DictFormat(DictTypeConstants.ORDER_STATUS) diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java index ea37689..2071ea4 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java @@ -11,6 +11,7 @@ import jakarta.validation.constraints.Size; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; @Schema(description = "管理后台 - WMS 入库单保存 Request VO") @@ -30,6 +31,10 @@ public class WmsReceiptOrderSaveReqVO { @InEnum(WmsReceiptOrderTypeEnum.class) private Integer type; + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "单据日期不能为空") + private LocalDateTime orderTime; + @Schema(description = "业务单号", example = "PO202605110001") @Size(max = 64, message = "业务单号长度不能超过 64 个字符") private String bizOrderNo; @@ -49,7 +54,8 @@ public class WmsReceiptOrderSaveReqVO { @NotNull(message = "入库数量不能为空") private BigDecimal totalQuantity; - @Schema(description = "总金额", example = "1000.00") + @Schema(description = "总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000.00") + @NotNull(message = "总金额不能为空") private BigDecimal totalAmount; @Schema(description = "入库明细") diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailRespVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailRespVO.java index 4ea906d..266fcf7 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailRespVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailRespVO.java @@ -49,9 +49,6 @@ public class WmsShipmentOrderDetailRespVO { @Schema(description = "金额", example = "1000.00") private BigDecimal amount; - @Schema(description = "备注", example = "备注") - private String remark; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailSaveReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailSaveReqVO.java index d10922c..8c0a159 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailSaveReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/detail/WmsShipmentOrderDetailSaveReqVO.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.shipment.vo.detail; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import lombok.Data; import java.math.BigDecimal; @@ -28,8 +27,4 @@ public class WmsShipmentOrderDetailSaveReqVO { @DecimalMin(value = "0", message = "金额不能小于 0") private BigDecimal amount; - @Schema(description = "备注", example = "备注") - @Size(max = 255, message = "备注长度不能超过 255 个字符") - private String remark; - } diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderPageReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderPageReqVO.java index 551be8d..02efd63 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderPageReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderPageReqVO.java @@ -36,7 +36,7 @@ public class WmsShipmentOrderPageReqVO extends PageParam { @Schema(description = "单据日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] orderDate; + private LocalDateTime[] orderTime; @Schema(description = "最小数量", example = "1.00") private BigDecimal totalQuantityMin; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderRespVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderRespVO.java index f776847..7a1fbb6 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderRespVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderRespVO.java @@ -30,6 +30,10 @@ public class WmsShipmentOrderRespVO { @DictFormat(DictTypeConstants.SHIPMENT_ORDER_TYPE) private Integer type; + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("单据日期") + private LocalDateTime orderTime; + @Schema(description = "出库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") @ExcelProperty(value = "出库状态", converter = DictConvert.class) @DictFormat(DictTypeConstants.ORDER_STATUS) diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderSaveReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderSaveReqVO.java index a4abb3f..8923775 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderSaveReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/shipment/vo/order/WmsShipmentOrderSaveReqVO.java @@ -11,6 +11,7 @@ import jakarta.validation.constraints.Size; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; @Schema(description = "管理后台 - WMS 出库单保存 Request VO") @@ -30,6 +31,10 @@ public class WmsShipmentOrderSaveReqVO { @InEnum(WmsShipmentOrderTypeEnum.class) private Integer type; + @Schema(description = "单据日期", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "单据日期不能为空") + private LocalDateTime orderTime; + @Schema(description = "业务单号", example = "SO202605110001") @Size(max = 64, message = "业务单号长度不能超过 64 个字符") private String bizOrderNo; @@ -49,7 +54,8 @@ public class WmsShipmentOrderSaveReqVO { @NotNull(message = "出库数量不能为空") private BigDecimal totalQuantity; - @Schema(description = "总金额", example = "1000.00") + @Schema(description = "总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000.00") + @NotNull(message = "总金额不能为空") private BigDecimal totalAmount; @Schema(description = "出库明细") diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/check/WmsCheckOrderDO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/check/WmsCheckOrderDO.java index 9301fd0..d14fe7a 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/check/WmsCheckOrderDO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/check/WmsCheckOrderDO.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * WMS 盘库单 DO @@ -35,6 +36,10 @@ public class WmsCheckOrderDO extends BaseDO { */ private String no; /** + * 单据日期 + */ + private LocalDateTime orderTime; + /** * 盘库状态 * * 字典 {@link DictTypeConstants#ORDER_STATUS} diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/movement/WmsMovementOrderDO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/movement/WmsMovementOrderDO.java index 80fd6d8..82ea52a 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/movement/WmsMovementOrderDO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/movement/WmsMovementOrderDO.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * WMS 移库单 DO @@ -35,6 +36,10 @@ public class WmsMovementOrderDO extends BaseDO { */ private String no; /** + * 单据日期 + */ + private LocalDateTime orderTime; + /** * 移库状态 * * 字典 {@link DictTypeConstants#ORDER_STATUS} diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java index 365b115..2fa8dd1 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * WMS 入库单 DO @@ -44,6 +45,10 @@ public class WmsReceiptOrderDO extends BaseDO { */ private Integer type; /** + * 单据日期 + */ + private LocalDateTime orderTime; + /** * 入库状态 * * 字典 {@link DictTypeConstants#ORDER_STATUS} diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/shipment/WmsShipmentOrderDO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/shipment/WmsShipmentOrderDO.java index c7d4390..75ce67a 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/shipment/WmsShipmentOrderDO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/shipment/WmsShipmentOrderDO.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * WMS 出库单 DO @@ -44,6 +45,10 @@ public class WmsShipmentOrderDO extends BaseDO { */ private Integer type; /** + * 单据日期 + */ + private LocalDateTime orderTime; + /** * 出库状态 * * 字典 {@link DictTypeConstants#ORDER_STATUS} diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/check/WmsCheckOrderMapper.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/check/WmsCheckOrderMapper.java index f480426..ea8d88a 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/check/WmsCheckOrderMapper.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/check/WmsCheckOrderMapper.java @@ -20,7 +20,7 @@ public interface WmsCheckOrderMapper extends BaseMapperX { .likeIfPresent(WmsCheckOrderDO::getNo, reqVO.getNo()) .eqIfPresent(WmsCheckOrderDO::getStatus, reqVO.getStatus()) .eqIfPresent(WmsCheckOrderDO::getWarehouseId, reqVO.getWarehouseId()) - .betweenIfPresent(WmsCheckOrderDO::getCreateTime, reqVO.getOrderDate()) + .betweenIfPresent(WmsCheckOrderDO::getOrderTime, reqVO.getOrderTime()) .geIfPresent(WmsCheckOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin()) .leIfPresent(WmsCheckOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax()) .geIfPresent(WmsCheckOrderDO::getTotalAmount, reqVO.getTotalAmountMin()) diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/movement/WmsMovementOrderMapper.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/movement/WmsMovementOrderMapper.java index 1aa6939..883c3a6 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/movement/WmsMovementOrderMapper.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/movement/WmsMovementOrderMapper.java @@ -21,7 +21,7 @@ public interface WmsMovementOrderMapper extends BaseMapperX .eqIfPresent(WmsMovementOrderDO::getStatus, reqVO.getStatus()) .eqIfPresent(WmsMovementOrderDO::getSourceWarehouseId, reqVO.getSourceWarehouseId()) .eqIfPresent(WmsMovementOrderDO::getTargetWarehouseId, reqVO.getTargetWarehouseId()) - .betweenIfPresent(WmsMovementOrderDO::getCreateTime, reqVO.getOrderDate()) + .betweenIfPresent(WmsMovementOrderDO::getOrderTime, reqVO.getOrderTime()) .geIfPresent(WmsMovementOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin()) .leIfPresent(WmsMovementOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax()) .geIfPresent(WmsMovementOrderDO::getTotalAmount, reqVO.getTotalAmountMin()) diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/receipt/WmsReceiptOrderMapper.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/receipt/WmsReceiptOrderMapper.java index f724e1b..5669f63 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/receipt/WmsReceiptOrderMapper.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/receipt/WmsReceiptOrderMapper.java @@ -21,7 +21,7 @@ public interface WmsReceiptOrderMapper extends BaseMapperX { .eqIfPresent(WmsReceiptOrderDO::getStatus, reqVO.getStatus()) .eqIfPresent(WmsReceiptOrderDO::getWarehouseId, reqVO.getWarehouseId()) .eqIfPresent(WmsReceiptOrderDO::getMerchantId, reqVO.getMerchantId()) - .betweenIfPresent(WmsReceiptOrderDO::getCreateTime, reqVO.getOrderDate()) + .betweenIfPresent(WmsReceiptOrderDO::getOrderTime, reqVO.getOrderTime()) .geIfPresent(WmsReceiptOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin()) .leIfPresent(WmsReceiptOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax()) .geIfPresent(WmsReceiptOrderDO::getTotalAmount, reqVO.getTotalAmountMin()) diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/shipment/WmsShipmentOrderMapper.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/shipment/WmsShipmentOrderMapper.java index 659d107..4b140e9 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/shipment/WmsShipmentOrderMapper.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/shipment/WmsShipmentOrderMapper.java @@ -21,7 +21,7 @@ public interface WmsShipmentOrderMapper extends BaseMapperX .eqIfPresent(WmsShipmentOrderDO::getStatus, reqVO.getStatus()) .eqIfPresent(WmsShipmentOrderDO::getWarehouseId, reqVO.getWarehouseId()) .eqIfPresent(WmsShipmentOrderDO::getMerchantId, reqVO.getMerchantId()) - .betweenIfPresent(WmsShipmentOrderDO::getCreateTime, reqVO.getOrderDate()) + .betweenIfPresent(WmsShipmentOrderDO::getOrderTime, reqVO.getOrderTime()) .geIfPresent(WmsShipmentOrderDO::getTotalQuantity, reqVO.getTotalQuantityMin()) .leIfPresent(WmsShipmentOrderDO::getTotalQuantity, reqVO.getTotalQuantityMax()) .geIfPresent(WmsShipmentOrderDO::getTotalAmount, reqVO.getTotalAmountMin()) diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderDetailServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderDetailServiceImplTest.java index f3452f6..6127b93 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderDetailServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderDetailServiceImplTest.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -118,6 +119,7 @@ public class WmsCheckOrderDetailServiceImplTest extends BaseDbUnitTest { private static WmsCheckOrderSaveReqVO createCheckOrderReqVO(WmsCheckOrderDetailSaveReqVO... details) { WmsCheckOrderSaveReqVO reqVO = new WmsCheckOrderSaveReqVO(); + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)); reqVO.setWarehouseId(100L); reqVO.setDetails(Arrays.asList(details)); return reqVO; diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderServiceImplTest.java index 4316407..4a8e70d 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderServiceImplTest.java @@ -18,6 +18,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; +import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.CHECK_ORDER_DETAIL_REQUIRED; @@ -153,6 +154,7 @@ public class WmsCheckOrderServiceImplTest extends BaseDbUnitTest { private static WmsCheckOrderDO createCheckOrder(Long warehouseId) { return new WmsCheckOrderDO() .setNo("PK202605120001") + .setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)) .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) .setWarehouseId(warehouseId) .setTotalQuantity(new BigDecimal("-3.00")) diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderDetailServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderDetailServiceImplTest.java index 52b9cd8..8bab4b6 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderDetailServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderDetailServiceImplTest.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -118,6 +119,7 @@ public class WmsMovementOrderDetailServiceImplTest extends BaseDbUnitTest { private static WmsMovementOrderSaveReqVO createMovementOrderReqVO(WmsMovementOrderDetailSaveReqVO... details) { WmsMovementOrderSaveReqVO reqVO = new WmsMovementOrderSaveReqVO(); + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)); reqVO.setSourceWarehouseId(100L); reqVO.setTargetWarehouseId(200L); reqVO.setDetails(Arrays.asList(details)); diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderServiceImplTest.java index 815f274..59094bc 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderServiceImplTest.java @@ -19,6 +19,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; +import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MOVEMENT_ORDER_DETAIL_REQUIRED; @@ -150,6 +151,7 @@ public class WmsMovementOrderServiceImplTest extends BaseDbUnitTest { private static WmsMovementOrderDO createMovementOrder(Long sourceWarehouseId, Long targetWarehouseId) { return new WmsMovementOrderDO() .setNo("YK202605120001") + .setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)) .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) .setSourceWarehouseId(sourceWarehouseId) .setTargetWarehouseId(targetWarehouseId) @@ -172,6 +174,7 @@ public class WmsMovementOrderServiceImplTest extends BaseDbUnitTest { private static WmsMovementOrderSaveReqVO createMovementOrderReqVO(Long sourceWarehouseId, Long targetWarehouseId) { WmsMovementOrderSaveReqVO reqVO = new WmsMovementOrderSaveReqVO(); reqVO.setNo("YK202605120001"); + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)); reqVO.setSourceWarehouseId(sourceWarehouseId); reqVO.setTargetWarehouseId(targetWarehouseId); reqVO.setTotalQuantity(new BigDecimal("2.00")); diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java index 9d79589..4106364 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -114,6 +115,7 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { private static WmsReceiptOrderSaveReqVO createReceiptOrderReqVO(WmsReceiptOrderDetailSaveReqVO... details) { WmsReceiptOrderSaveReqVO reqVO = new WmsReceiptOrderSaveReqVO(); + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)); reqVO.setWarehouseId(100L); reqVO.setDetails(Arrays.asList(details)); return reqVO; diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java index a13f2ff..5ff526f 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java @@ -20,6 +20,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; +import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_DETAIL_REQUIRED; @@ -138,6 +139,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { return new WmsReceiptOrderDO() .setNo("RK202605120001") .setType(WmsReceiptOrderTypeEnum.PURCHASE.getType()) + .setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)) .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) .setWarehouseId(warehouseId) .setTotalQuantity(new BigDecimal("2.00")) diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderDetailServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderDetailServiceImplTest.java index 99f6793..b9ba624 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderDetailServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderDetailServiceImplTest.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -115,6 +116,7 @@ public class WmsShipmentOrderDetailServiceImplTest extends BaseDbUnitTest { private static WmsShipmentOrderSaveReqVO createShipmentOrderReqVO(WmsShipmentOrderDetailSaveReqVO... details) { WmsShipmentOrderSaveReqVO reqVO = new WmsShipmentOrderSaveReqVO(); + reqVO.setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)); reqVO.setWarehouseId(100L); reqVO.setDetails(Arrays.asList(details)); return reqVO; diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderServiceImplTest.java index cfc227e..65b6868 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderServiceImplTest.java @@ -20,6 +20,7 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; +import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.SHIPMENT_ORDER_DETAIL_REQUIRED; @@ -138,6 +139,7 @@ public class WmsShipmentOrderServiceImplTest extends BaseDbUnitTest { return new WmsShipmentOrderDO() .setNo("CK202605120001") .setType(WmsShipmentOrderTypeEnum.SALE.getType()) + .setOrderTime(LocalDateTime.of(2026, 5, 12, 0, 0)) .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) .setWarehouseId(warehouseId) .setTotalQuantity(new BigDecimal("2.00")) diff --git a/yudao-module-wms/src/test/resources/sql/create_tables.sql b/yudao-module-wms/src/test/resources/sql/create_tables.sql index 6379b1a..5512bb8 100644 --- a/yudao-module-wms/src/test/resources/sql/create_tables.sql +++ b/yudao-module-wms/src/test/resources/sql/create_tables.sql @@ -78,6 +78,7 @@ CREATE TABLE IF NOT EXISTS "wms_receipt_order" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, "no" varchar(64) NOT NULL, "type" int NOT NULL, + "order_time" timestamp NOT NULL, "status" int NOT NULL DEFAULT '0', "biz_order_no" varchar(64) DEFAULT NULL, "merchant_id" bigint DEFAULT NULL, @@ -96,7 +97,6 @@ CREATE TABLE IF NOT EXISTS "wms_receipt_order" ( CREATE TABLE IF NOT EXISTS "wms_receipt_order_detail" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "remark" varchar(255) DEFAULT NULL, "order_id" bigint NOT NULL, "sku_id" bigint NOT NULL, "warehouse_id" bigint NOT NULL, @@ -115,6 +115,7 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, "no" varchar(64) NOT NULL, "type" int NOT NULL, + "order_time" timestamp NOT NULL, "status" int NOT NULL DEFAULT '0', "biz_order_no" varchar(64) DEFAULT NULL, "merchant_id" bigint DEFAULT NULL, @@ -133,7 +134,6 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order" ( CREATE TABLE IF NOT EXISTS "wms_shipment_order_detail" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "remark" varchar(255) DEFAULT NULL, "order_id" bigint NOT NULL, "sku_id" bigint NOT NULL, "warehouse_id" bigint NOT NULL, @@ -151,6 +151,7 @@ CREATE TABLE IF NOT EXISTS "wms_shipment_order_detail" ( CREATE TABLE IF NOT EXISTS "wms_movement_order" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, "no" varchar(64) NOT NULL, + "order_time" timestamp NOT NULL, "status" int NOT NULL DEFAULT '0', "remark" varchar(255) DEFAULT NULL, "source_warehouse_id" bigint NOT NULL, @@ -168,7 +169,6 @@ CREATE TABLE IF NOT EXISTS "wms_movement_order" ( CREATE TABLE IF NOT EXISTS "wms_movement_order_detail" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "remark" varchar(255) DEFAULT NULL, "order_id" bigint NOT NULL, "sku_id" bigint NOT NULL, "source_warehouse_id" bigint NOT NULL, @@ -187,6 +187,7 @@ CREATE TABLE IF NOT EXISTS "wms_movement_order_detail" ( CREATE TABLE IF NOT EXISTS "wms_check_order" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, "no" varchar(64) NOT NULL, + "order_time" timestamp NOT NULL, "status" int NOT NULL DEFAULT '0', "remark" varchar(255) DEFAULT NULL, "warehouse_id" bigint NOT NULL, @@ -203,7 +204,6 @@ CREATE TABLE IF NOT EXISTS "wms_check_order" ( CREATE TABLE IF NOT EXISTS "wms_check_order_detail" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "remark" varchar(255) DEFAULT NULL, "order_id" bigint NOT NULL, "sku_id" bigint NOT NULL, "warehouse_id" bigint NOT NULL,