|
@@ -3,6 +3,7 @@ package easydo.technology.model;
|
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
|
import lombok.EqualsAndHashCode;
|
|
import lombok.EqualsAndHashCode;
|
|
|
|
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
@Data
|
|
@Data
|
|
@@ -10,15 +11,19 @@ import java.util.List;
|
|
|
public class PurchaseOrder extends CommonModel {
|
|
public class PurchaseOrder extends CommonModel {
|
|
|
private String id;
|
|
private String id;
|
|
|
private String code;
|
|
private String code;
|
|
|
|
|
+ private String contractNo;
|
|
|
private String name;
|
|
private String name;
|
|
|
private String saleOrderId;
|
|
private String saleOrderId;
|
|
|
private String customerId;
|
|
private String customerId;
|
|
|
- private Long managerUserId;
|
|
|
|
|
|
|
+ private Long managerId;
|
|
|
private String createTime;
|
|
private String createTime;
|
|
|
|
|
+ private String orderDate;
|
|
|
private String status;
|
|
private String status;
|
|
|
private String category;
|
|
private String category;
|
|
|
private String planReceiveDate;
|
|
private String planReceiveDate;
|
|
|
private String actualReceiveDate;
|
|
private String actualReceiveDate;
|
|
|
|
|
+ private String deliveryDate;
|
|
|
|
|
+ private String deliveryAddress;
|
|
|
private String purchasePlanId;
|
|
private String purchasePlanId;
|
|
|
private Long createId;
|
|
private Long createId;
|
|
|
private Long updateId;
|
|
private Long updateId;
|
|
@@ -26,6 +31,9 @@ public class PurchaseOrder extends CommonModel {
|
|
|
private String updateTime;
|
|
private String updateTime;
|
|
|
private String expressNo;
|
|
private String expressNo;
|
|
|
private String remark;
|
|
private String remark;
|
|
|
|
|
+ private BigDecimal incomePrice;
|
|
|
|
|
+ private BigDecimal freePrice;
|
|
|
|
|
+ private BigDecimal actualPrice;
|
|
|
|
|
|
|
|
// 非数据库字段,用于级联组装
|
|
// 非数据库字段,用于级联组装
|
|
|
private List<String> emptyField;
|
|
private List<String> emptyField;
|
|
@@ -34,5 +42,5 @@ public class PurchaseOrder extends CommonModel {
|
|
|
private SaleOrder saleOrder;
|
|
private SaleOrder saleOrder;
|
|
|
private Customer customer;
|
|
private Customer customer;
|
|
|
private PurchasePlan purchasePlan;
|
|
private PurchasePlan purchasePlan;
|
|
|
- private String managerUserName; // 负责人姓名(非数据库字段)
|
|
|
|
|
|
|
+ private String managerName; // 负责人姓名(非数据库字段)
|
|
|
}
|
|
}
|