diff --git a/klp-erp/src/main/java/com/klp/erp/domain/ErpPurchaseOrder.java b/klp-erp/src/main/java/com/klp/erp/domain/ErpPurchaseOrder.java
index 215e5e39..e4a5c821 100644
--- a/klp-erp/src/main/java/com/klp/erp/domain/ErpPurchaseOrder.java
+++ b/klp-erp/src/main/java/com/klp/erp/domain/ErpPurchaseOrder.java
@@ -76,4 +76,80 @@ public class ErpPurchaseOrder extends BaseEntity {
*/
private String remark;
+ /**
+ * 单据类型
+ */
+ private String billType;
+
+ /**
+ * 收发类别
+ */
+ private String receiveType;
+
+ /**
+ * 部门
+ */
+ private String deptName;
+
+ /**
+ * 业务员
+ */
+ private String salesman;
+
+ /**
+ * 供货单位ID
+ */
+ private Long supplyUnitId;
+
+ /**
+ * 制单人
+ */
+ private String maker;
+
+ /**
+ * 审核人
+ */
+ private String auditor;
+
+ /**
+ * 记账人
+ */
+ private String bookkeeper;
+
+ /**
+ * 审核日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date auditDate;
+
+ /**
+ * 存货编码
+ */
+ private String stockCode;
+
+ /**
+ * 存货名称
+ */
+ private String stockName;
+
+ /**
+ * 规格型号
+ */
+ private String specModel;
+
+ /**
+ * 主计量单位
+ */
+ private String mainUnit;
+
+ /**
+ * 入库数量
+ */
+ private String stockQuantity;
+
+ /**
+ * 仓库ID
+ */
+ private Long warehouseId;
+
}
diff --git a/klp-erp/src/main/java/com/klp/erp/domain/bo/ErpPurchaseOrderBo.java b/klp-erp/src/main/java/com/klp/erp/domain/bo/ErpPurchaseOrderBo.java
index de02dc35..351c7b82 100644
--- a/klp-erp/src/main/java/com/klp/erp/domain/bo/ErpPurchaseOrderBo.java
+++ b/klp-erp/src/main/java/com/klp/erp/domain/bo/ErpPurchaseOrderBo.java
@@ -83,5 +83,80 @@ public class ErpPurchaseOrderBo extends BaseEntity {
*/
private String remark;
+ /**
+ * 单据类型
+ */
+ private String billType;
+
+ /**
+ * 收发类别
+ */
+ private String receiveType;
+
+ /**
+ * 部门
+ */
+ private String deptName;
+
+ /**
+ * 业务员
+ */
+ private String salesman;
+
+ /**
+ * 供货单位ID
+ */
+ private Long supplyUnitId;
+
+ /**
+ * 制单人
+ */
+ private String maker;
+
+ /**
+ * 审核人
+ */
+ private String auditor;
+
+ /**
+ * 记账人
+ */
+ private String bookkeeper;
+
+ /**
+ * 审核日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date auditDate;
+
+ /**
+ * 存货编码
+ */
+ private String stockCode;
+
+ /**
+ * 存货名称
+ */
+ private String stockName;
+
+ /**
+ * 规格型号
+ */
+ private String specModel;
+
+ /**
+ * 主计量单位
+ */
+ private String mainUnit;
+
+ /**
+ * 入库数量
+ */
+ private String stockQuantity;
+
+ /**
+ * 仓库ID
+ */
+ private Long warehouseId;
}
diff --git a/klp-erp/src/main/java/com/klp/erp/domain/vo/ErpPurchaseOrderVo.java b/klp-erp/src/main/java/com/klp/erp/domain/vo/ErpPurchaseOrderVo.java
index 0143c0f9..0695d0a4 100644
--- a/klp-erp/src/main/java/com/klp/erp/domain/vo/ErpPurchaseOrderVo.java
+++ b/klp-erp/src/main/java/com/klp/erp/domain/vo/ErpPurchaseOrderVo.java
@@ -90,5 +90,95 @@ public class ErpPurchaseOrderVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
+ /**
+ * 单据类型
+ */
+ @ExcelProperty(value = "单据类型")
+ private String billType;
+
+ /**
+ * 收发类别
+ */
+ @ExcelProperty(value = "收发类别")
+ private String receiveType;
+
+ /**
+ * 部门
+ */
+ @ExcelProperty(value = "部门")
+ private String deptName;
+
+ /**
+ * 业务员
+ */
+ @ExcelProperty(value = "业务员")
+ private String salesman;
+
+ /**
+ * 供货单位ID
+ */
+ @ExcelProperty(value = "供货单位ID")
+ private Long supplyUnitId;
+
+ /**
+ * 制单人
+ */
+ @ExcelProperty(value = "制单人")
+ private String maker;
+
+ /**
+ * 审核人
+ */
+ @ExcelProperty(value = "审核人")
+ private String auditor;
+
+ /**
+ * 记账人
+ */
+ @ExcelProperty(value = "记账人")
+ private String bookkeeper;
+
+ /**
+ * 审核日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelProperty(value = "审核日期")
+ private Date auditDate;
+
+ /**
+ * 存货编码
+ */
+ @ExcelProperty(value = "存货编码")
+ private String stockCode;
+
+ /**
+ * 存货名称
+ */
+ @ExcelProperty(value = "存货名称")
+ private String stockName;
+
+ /**
+ * 规格型号
+ */
+ @ExcelProperty(value = "规格型号")
+ private String specModel;
+
+ /**
+ * 主计量单位
+ */
+ @ExcelProperty(value = "主计量单位")
+ private String mainUnit;
+
+ /**
+ * 入库数量
+ */
+ @ExcelProperty(value = "入库数量")
+ private String stockQuantity;
+
+ /**
+ * 仓库ID
+ */
+ @ExcelProperty(value = "仓库ID")
+ private Long warehouseId;
}
diff --git a/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java b/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java
index 0a6dc5b7..ff89df34 100644
--- a/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java
+++ b/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java
@@ -78,6 +78,21 @@ public class ErpPurchaseOrderServiceImpl implements IErpPurchaseOrderService {
lqw.eq(bo.getTotalAmount() != null, ErpPurchaseOrder::getTotalAmount, bo.getTotalAmount());
lqw.eq(bo.getOrderStatus() != null, ErpPurchaseOrder::getOrderStatus, bo.getOrderStatus());
lqw.like(StringUtils.isNotBlank(bo.getConfirmBy()), ErpPurchaseOrder::getConfirmBy, bo.getConfirmBy());
+ lqw.eq(StringUtils.isNotBlank(bo.getBillType()), ErpPurchaseOrder::getBillType, bo.getBillType());
+ lqw.eq(StringUtils.isNotBlank(bo.getReceiveType()), ErpPurchaseOrder::getReceiveType, bo.getReceiveType());
+ lqw.like(StringUtils.isNotBlank(bo.getDeptName()), ErpPurchaseOrder::getDeptName, bo.getDeptName());
+ lqw.like(StringUtils.isNotBlank(bo.getSalesman()), ErpPurchaseOrder::getSalesman, bo.getSalesman());
+ lqw.eq(bo.getSupplyUnitId() != null, ErpPurchaseOrder::getSupplyUnitId, bo.getSupplyUnitId());
+ lqw.like(StringUtils.isNotBlank(bo.getMaker()), ErpPurchaseOrder::getMaker, bo.getMaker());
+ lqw.like(StringUtils.isNotBlank(bo.getAuditor()), ErpPurchaseOrder::getAuditor, bo.getAuditor());
+ lqw.like(StringUtils.isNotBlank(bo.getBookkeeper()), ErpPurchaseOrder::getBookkeeper, bo.getBookkeeper());
+ lqw.eq(bo.getAuditDate() != null, ErpPurchaseOrder::getAuditDate, bo.getAuditDate());
+ lqw.like(StringUtils.isNotBlank(bo.getStockCode()), ErpPurchaseOrder::getStockCode, bo.getStockCode());
+ lqw.like(StringUtils.isNotBlank(bo.getStockName()), ErpPurchaseOrder::getStockName, bo.getStockName());
+ lqw.like(StringUtils.isNotBlank(bo.getSpecModel()), ErpPurchaseOrder::getSpecModel, bo.getSpecModel());
+ lqw.eq(StringUtils.isNotBlank(bo.getMainUnit()), ErpPurchaseOrder::getMainUnit, bo.getMainUnit());
+ lqw.eq(StringUtils.isNotBlank(bo.getStockQuantity()), ErpPurchaseOrder::getStockQuantity, bo.getStockQuantity());
+ lqw.eq(bo.getWarehouseId() != null, ErpPurchaseOrder::getWarehouseId, bo.getWarehouseId());
return lqw;
}
diff --git a/klp-erp/src/main/resources/mapper/erp/ErpPurchaseOrderMapper.xml b/klp-erp/src/main/resources/mapper/erp/ErpPurchaseOrderMapper.xml
index 7d53ce8c..8e7c480b 100644
--- a/klp-erp/src/main/resources/mapper/erp/ErpPurchaseOrderMapper.xml
+++ b/klp-erp/src/main/resources/mapper/erp/ErpPurchaseOrderMapper.xml
@@ -21,6 +21,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+