|
|
@@ -3,8 +3,6 @@ package org.dromara.external.api.thirdparty.domain.bo;
|
|
|
import jakarta.validation.constraints.NotBlank;
|
|
|
import jakarta.validation.constraints.NotNull;
|
|
|
import lombok.Data;
|
|
|
-import org.dromara.common.core.validate.AddGroup;
|
|
|
-import org.dromara.common.core.validate.EditGroup;
|
|
|
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
@@ -15,49 +13,49 @@ public class ThirdpartyOrderAddBo {
|
|
|
/**
|
|
|
* 所属公司
|
|
|
*/
|
|
|
- @NotNull(message = "所属公司不能为空", groups = {AddGroup.class, EditGroup.class})
|
|
|
+ @NotNull(message = "所属公司不能为空")
|
|
|
private Long companyId;
|
|
|
|
|
|
/**
|
|
|
* 客户ID(关联客户主表)
|
|
|
*/
|
|
|
- @NotNull(message = "客户ID(关联客户主表)不能为空", groups = {AddGroup.class, EditGroup.class})
|
|
|
+ @NotNull(message = "客户ID(关联客户主表)不能为空")
|
|
|
private Long customerId;
|
|
|
|
|
|
/**
|
|
|
* 收货地址ID
|
|
|
*/
|
|
|
- @NotNull(message = "收货地址ID不能为空", groups = {AddGroup.class, EditGroup.class})
|
|
|
+ @NotNull(message = "收货地址ID不能为空")
|
|
|
private Long shippingAddressId;
|
|
|
|
|
|
/**
|
|
|
* 采购事由
|
|
|
*/
|
|
|
- @NotNull(message = "采购事由不能为空", groups = {AddGroup.class, EditGroup.class})
|
|
|
+ @NotBlank(message = "采购事由不能为空")
|
|
|
private String purchaseReason;
|
|
|
|
|
|
/**
|
|
|
* 支付方式
|
|
|
*/
|
|
|
- @NotBlank(message = "支付方式不能为空", groups = {AddGroup.class, EditGroup.class})
|
|
|
+ @NotBlank(message = "支付方式不能为空")
|
|
|
private String payType;
|
|
|
|
|
|
/**
|
|
|
* 发货仓库
|
|
|
*/
|
|
|
- @NotNull(message = "发货仓库不能为空", groups = {AddGroup.class, EditGroup.class})
|
|
|
+ @NotNull(message = "发货仓库不能为空")
|
|
|
private Long warehouseId;
|
|
|
|
|
|
/**
|
|
|
* 预计送达时间
|
|
|
*/
|
|
|
- @NotNull(message = "预计送达时间不能为空", groups = {AddGroup.class, EditGroup.class})
|
|
|
+ @NotNull(message = "预计送达时间不能为空")
|
|
|
private Date expectedDeliveryTime;
|
|
|
|
|
|
/**
|
|
|
* 费用类型
|
|
|
*/
|
|
|
- @NotBlank(message = "费用类型不能为空", groups = {AddGroup.class, EditGroup.class})
|
|
|
+ @NotBlank(message = "费用类型不能为空")
|
|
|
private String expenseType;
|
|
|
|
|
|
/**
|