From abc7682e6f7dc4909118880fd3cbc95977f9c76c Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 6 May 2026 09:47:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在ErpPurchaseOrder实体类中新增单据类型、收发类别、部门、业务员等字段
- 在ErpPurchaseOrderBo业务对象中同步添加对应的查询条件字段
- 在ErpPurchaseOrderVo视图对象中添加Excel导出注解配置
- 在MyBatis映射文件中配置新增字段的数据库映射关系
- 在服务实现类中为新增字段添加查询条件构建逻辑
- 统一处理新增字段的JSON序列化和反序列化格式
---
 .../com/klp/erp/domain/ErpPurchaseOrder.java  | 76 ++++++++++++++++
 .../klp/erp/domain/bo/ErpPurchaseOrderBo.java | 75 ++++++++++++++++
 .../klp/erp/domain/vo/ErpPurchaseOrderVo.java | 90 +++++++++++++++++++
 .../impl/ErpPurchaseOrderServiceImpl.java     | 15 ++++
 .../mapper/erp/ErpPurchaseOrderMapper.xml     | 15 ++++
 5 files changed, 271 insertions(+)

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"
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
+        <result property="billType" column="bill_type"/>
+        <result property="receiveType" column="receive_type"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="salesman" column="salesman"/>
+        <result property="supplyUnitId" column="supply_unit_id"/>
+        <result property="maker" column="maker"/>
+        <result property="auditor" column="auditor"/>
+        <result property="bookkeeper" column="bookkeeper"/>
+        <result property="auditDate" column="audit_date"/>
+        <result property="stockCode" column="stock_code"/>
+        <result property="stockName" column="stock_name"/>
+        <result property="specModel" column="spec_model"/>
+        <result property="mainUnit" column="main_unit"/>
+        <result property="stockQuantity" column="stock_quantity"/>
+        <result property="warehouseId" column="warehouse_id"/>
     </resultMap>