DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交基础采购

Browse Source
This commit is contained in:
86156
2025-11-18 16:45:28 +08:00
parent 7c04e13198
commit 617e149fc8
7 changed files with 233 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
klp-erp/src/main/java/com/klp/erp/domain/ErpPurchaseOrder.java
View File

@@ -38,10 +38,12 @@ public class ErpPurchaseOrder extends BaseEntity {
/**
* 下单日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date orderDate;
/**
* 预计到货日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date expectedArrival;
/**
* 订单类型
@@ -54,7 +56,16 @@ public class ErpPurchaseOrder extends BaseEntity {
/**
* 订单状态
*/
private Long orderStatus;
private Integer orderStatus;
/**
* 下达人
*/
private String confirmBy;
/**
* 下达时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date confirmTime;
/**
* 删除标志
*/

24
klp-erp/src/main/java/com/klp/erp/domain/bo/ErpPurchaseOrderBo.java
View File

@@ -1,13 +1,16 @@
package com.klp.erp.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.klp.common.core.domain.BaseEntity;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 采购订单主业务对象 erp_purchase_order
@@ -28,21 +31,25 @@ public class ErpPurchaseOrderBo extends BaseEntity {
/**
* 订单编号
*/
@NotBlank(message = "订单编号不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderCode;
/**
* 供应商ID
*/
@NotNull(message = "供应商不能为空", groups = {AddGroup.class, EditGroup.class})
private Long supplierId;
/**
* 下单日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date orderDate;
/**
* 预计到货日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date expectedArrival;
/**
@@ -58,7 +65,18 @@ public class ErpPurchaseOrderBo extends BaseEntity {
/**
* 订单状态
*/
private Long orderStatus;
private Integer orderStatus;
/**
* 下达人
*/
private String confirmBy;
/**
* 下达时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date confirmTime;
/**
* 备注

28
klp-erp/src/main/java/com/klp/erp/domain/vo/ErpPurchaseOrderVo.java
View File

@@ -1,14 +1,13 @@
package com.klp.erp.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 采购订单主视图对象 erp_purchase_order
@@ -18,7 +17,7 @@ import lombok.Data;
*/
@Data
@ExcelIgnoreUnannotated
public class ErpPurchaseOrderVo {
public class ErpPurchaseOrderVo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -44,12 +43,14 @@ public class ErpPurchaseOrderVo {
* 下单日期
*/
@ExcelProperty(value = "下单日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date orderDate;
/**
* 预计到货日期
*/
@ExcelProperty(value = "预计到货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date expectedArrival;
/**
@@ -68,7 +69,20 @@ public class ErpPurchaseOrderVo {
* 订单状态
*/
@ExcelProperty(value = "订单状态")
private Long orderStatus;
private Integer orderStatus;
/**
* 下达人
*/
@ExcelProperty(value = "下达人")
private String confirmBy;
/**
* 下达时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "下达时间")
private Date confirmTime;
/**
* 备注