|
|
@@ -6,6 +6,7 @@ import jakarta.validation.constraints.NotBlank;
|
|
|
import jakarta.validation.constraints.NotNull;
|
|
|
import lombok.Data;
|
|
|
import lombok.experimental.Accessors;
|
|
|
+import org.hibernate.validator.constraints.Length;
|
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
|
|
import java.util.Date;
|
|
|
@@ -46,15 +47,18 @@ public class LogisticsConsignmentParam {
|
|
|
/**
|
|
|
* 联系电话
|
|
|
*/
|
|
|
+ @NotNull(message = "托运联系电话不能为空")
|
|
|
private String checkContactPhone;
|
|
|
/**
|
|
|
* 联系人
|
|
|
*/
|
|
|
+ @NotNull(message = "托运联系人不能为空")
|
|
|
private String checkContacts;
|
|
|
|
|
|
/**
|
|
|
* 合理损耗
|
|
|
*/
|
|
|
+ @NotNull(message = "合理损耗不能为空")
|
|
|
private Long loss;
|
|
|
/**
|
|
|
* 合理损耗单位
|
|
|
@@ -64,6 +68,7 @@ public class LogisticsConsignmentParam {
|
|
|
/**
|
|
|
* 商品价值(扣亏货值)
|
|
|
*/
|
|
|
+ @NotNull(message = "扣亏货值不能为空")
|
|
|
private Long goodsPrice;
|
|
|
/**
|
|
|
* 商品价值(扣亏货值)单位
|
|
|
@@ -84,32 +89,35 @@ public class LogisticsConsignmentParam {
|
|
|
/**
|
|
|
* 联系电话
|
|
|
*/
|
|
|
+ @NotNull(message = "承运联系电话不能为空")
|
|
|
private String consignContactPhone;
|
|
|
/**
|
|
|
* 联系人
|
|
|
*/
|
|
|
+ @NotNull(message = "承运联系人不能为空")
|
|
|
private String consignContacts;
|
|
|
|
|
|
/**
|
|
|
* 结算周期(周结、月结、季结)
|
|
|
*/
|
|
|
+ @NotNull(message = "结算周期不能为空")
|
|
|
private Long settlementCycle;
|
|
|
- /**
|
|
|
- * 合同
|
|
|
- */
|
|
|
- private String contract;
|
|
|
+
|
|
|
/**
|
|
|
* 合同id
|
|
|
*/
|
|
|
+ @NotNull(message = "合同id不能为空")
|
|
|
private String contractId;
|
|
|
/**
|
|
|
* 合同编号
|
|
|
*/
|
|
|
+ @NotNull(message = "合同编号不能为空")
|
|
|
private String contractNo;
|
|
|
|
|
|
/**
|
|
|
* 合同名称
|
|
|
*/
|
|
|
+ @NotNull(message = "合同名称不能为空")
|
|
|
private String contractName;
|
|
|
|
|
|
/**
|
|
|
@@ -120,6 +128,7 @@ public class LogisticsConsignmentParam {
|
|
|
/**
|
|
|
* 货物名称
|
|
|
*/
|
|
|
+ @NotNull(message = "货物名称不能为空")
|
|
|
private String goodsName;
|
|
|
|
|
|
/**
|
|
|
@@ -151,11 +160,13 @@ public class LogisticsConsignmentParam {
|
|
|
* 贸易订单id
|
|
|
*/
|
|
|
@JsonProperty("tOrderId")
|
|
|
+ @NotNull(message = "贸易订单id不能为空")
|
|
|
private String tOrderId;
|
|
|
/**
|
|
|
* 贸易订单编号
|
|
|
*/
|
|
|
- @JsonProperty("lOrderNo")
|
|
|
+ @JsonProperty("tOrderNo")
|
|
|
+ @NotNull(message = "贸易订单编号不能为空")
|
|
|
private String tOrderNo;
|
|
|
/**
|
|
|
* 运价
|
|
|
@@ -165,30 +176,36 @@ public class LogisticsConsignmentParam {
|
|
|
/**
|
|
|
* 运价方式
|
|
|
*/
|
|
|
+ @NotNull(message = "运价方式不能为空")
|
|
|
private String priceType;
|
|
|
/**
|
|
|
* 计划卸货时间
|
|
|
*/
|
|
|
+ @NotNull(message = "计划卸货时间不能为空")
|
|
|
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
private Date receiveGoodsDateTime;
|
|
|
/**
|
|
|
* 计划发货时间
|
|
|
*/
|
|
|
+ @NotNull(message = "计划发货时间不能为空")
|
|
|
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
private Date shipmentsDateTime;
|
|
|
/**
|
|
|
* 税率
|
|
|
*/
|
|
|
+ @NotNull(message = "税率不能为空")
|
|
|
private Long taxRate;
|
|
|
/**
|
|
|
* 备注
|
|
|
*/
|
|
|
+ @Length(max = 400,message = "单据编号长度错误最大长度:{max}")
|
|
|
private String remark;
|
|
|
/**
|
|
|
* 计费方式
|
|
|
*/
|
|
|
+ @NotNull(message = "计费方式不能为空")
|
|
|
private String billingMode;
|
|
|
|
|
|
}
|