feat(erp): 采购计划/采购审核/到货跟踪 + 供应商管理

- 采购计划:选合同自动带出明细、合同/供应商表格选择器、批量填充(可生成N行)、卷号/数量列、送审/重新送审流程
- 采购审核:通过/驳回 + 申请意见,每次审核留痕(erp_purchase_plan_audit_log),计划详情展示审核历史/驳回理由
- 到货跟踪:上传到货Excel按牌号+规格回填明细到货量与状态,列校验/kg→t纠正,满额自动归档
- 供应商管理页(复用既有 erp_supplier 后端)
- 综合搜索(计划号/供货商/合同号)、左右分栏工作台、全局表单按钮对齐修复
- 清理无用旧 erp 页面(看板/需求/订单/收货/退货/汇总)
- DDL 与菜单脚本:docs/purchase-plan-ddl.sql(按 path 解析父目录、可重复执行)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
2026-06-25 16:53:21 +08:00
parent 47931b75ae
commit ce3998db74
38 changed files with 3559 additions and 2842 deletions

View File

@@ -0,0 +1,66 @@
package com.klp.erp.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
/**
* 采购计划头对象 erp_purchase_plan
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("erp_purchase_plan")
public class ErpPurchasePlan extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 计划ID */
@TableId(value = "plan_id")
private Long planId;
/** 采购计划号 */
private String planNo;
/** 计划状态: 0-进行中 1-已完成归档 */
private String planStatus;
/** 审核状态: 0-待审核 1-通过 2-驳回 */
private String auditStatus;
/** 申请/审核意见 */
private String auditOpinion;
/** 审核人 */
private String auditor;
/** 审核时间 */
private Date auditTime;
/** 供货商 */
private String supplier;
/** 采购日期 */
private Date purchaseDate;
/** 计划总重量(T) */
private BigDecimal planWeight;
/** 已到货重量(T) */
private BigDecimal arrivedWeight;
/** 删除标志 */
@TableLogic
private String delFlag;
/** 备注 */
private String remark;
}

View File

@@ -0,0 +1,38 @@
package com.klp.erp.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 采购计划审核日志(每次审核留痕)
*
* @author klp
* @date 2026-06-25
*/
@Data
@TableName("erp_purchase_plan_audit_log")
public class ErpPurchasePlanAuditLog implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "log_id")
private Long logId;
private Long planId;
/** 审核结果: 1-通过 2-驳回 */
private String auditStatus;
/** 审核/驳回意见 */
private String auditOpinion;
private String auditor;
private Date auditTime;
private Date createTime;
}

View File

@@ -0,0 +1,39 @@
package com.klp.erp.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 采购计划-销售合同关联对象 erp_purchase_plan_contract_rel
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("erp_purchase_plan_contract_rel")
public class ErpPurchasePlanContractRel extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 关系ID */
@TableId(value = "rel_id")
private Long relId;
/** 采购计划ID */
private Long planId;
/** 销售合同ID(crm_order.order_id) */
private Long orderId;
/** 删除标志 */
@TableLogic
private String delFlag;
/** 备注 */
private String remark;
}

View File

@@ -0,0 +1,69 @@
package com.klp.erp.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
/**
* 采购计划到货明细对象 erp_purchase_plan_delivery
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("erp_purchase_plan_delivery")
public class ErpPurchasePlanDelivery extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 到货明细ID */
@TableId(value = "delivery_id")
private Long deliveryId;
/** 关联计划ID */
private Long planId;
/** 日期 */
private Date arrivalDate;
/** 牌号 */
private String grade;
/** 规格(厚×宽) */
private String spec;
/** 卷号 */
private String coilNo;
/** 单卷重量(T) */
private BigDecimal coilWeight;
/** 车号 */
private String truckNo;
/** 整车数量(T) */
private BigDecimal truckWeight;
/** 件数 */
private Integer pieceCount;
/** 销售代码 */
private String salesCode;
/** 钢厂到站 */
private String arrivalStation;
/** 删除标志 */
@TableLogic
private String delFlag;
/** 备注 */
private String remark;
}

View File

@@ -0,0 +1,77 @@
package com.klp.erp.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 采购计划明细对象 erp_purchase_plan_item
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("erp_purchase_plan_item")
public class ErpPurchasePlanItem extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 明细ID */
@TableId(value = "item_id")
private Long itemId;
/** 关联计划ID */
private Long planId;
/** 产品(如热轧卷板) */
private String productType;
/** 材质 */
private String material;
/** 牌号 */
private String grade;
/** 卷号 */
private String coilNo;
/** 宽度(mm可为区间文本) */
private String width;
/** 厚度(mm可为区间文本) */
private String thickness;
/** 宽度公差 */
private String widthTolerance;
/** 厚度公差 */
private String thicknessTolerance;
/** 重量(T) */
private BigDecimal weight;
/** 数量(件/卷数) */
private Integer quantity;
/** 已到货重量(T)由到货Excel按牌号+规格累加 */
private BigDecimal arrivedWeight;
/** 到货状态: 0-未到货 1-部分到货 2-已到货 */
private String itemStatus;
/** 供货商 */
private String supplier;
/** 删除标志 */
@TableLogic
private String delFlag;
/** 备注 */
private String remark;
}

View File

@@ -0,0 +1,26 @@
package com.klp.erp.domain.bo;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* 采购计划审核业务对象
*
* @author klp
* @date 2026-06-22
*/
@Data
public class ErpPurchasePlanAuditBo {
/** 计划ID */
@NotNull(message = "计划ID不能为空")
private Long planId;
/** 审核结果: 1-通过 2-驳回 */
@NotNull(message = "审核结果不能为空")
private String auditStatus;
/** 申请/审核意见 */
private String auditOpinion;
}

View File

@@ -0,0 +1,55 @@
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.NotNull;
import java.util.Date;
import java.util.List;
/**
* 采购计划头业务对象 erp_purchase_plan
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ErpPurchasePlanBo extends BaseEntity {
/** 计划ID */
@NotNull(message = "计划ID不能为空", groups = {EditGroup.class})
private Long planId;
/** 采购计划号(为空时自动生成) */
private String planNo;
/** 综合搜索关键字:计划号 / 供货商 / 合同号 */
private String keyword;
/** 计划状态: 0-进行中 1-已完成归档 */
private String planStatus;
/** 审核状态: 0-待审核 1-通过 2-驳回 */
private String auditStatus;
/** 供货商 */
private String supplier;
/** 采购日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date purchaseDate;
/** 备注 */
private String remark;
/** 明细行 */
private List<ErpPurchasePlanItemBo> items;
/** 关联的销售合同ID列表(crm_order.order_id) */
private List<Long> orderIds;
}

View File

@@ -0,0 +1,60 @@
package com.klp.erp.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 采购计划明细业务对象 erp_purchase_plan_item
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ErpPurchasePlanItemBo extends BaseEntity {
/** 明细ID */
private Long itemId;
/** 关联计划ID */
private Long planId;
/** 产品(如热轧卷板) */
private String productType;
/** 材质 */
private String material;
/** 牌号 */
private String grade;
/** 卷号 */
private String coilNo;
/** 宽度(mm可为区间文本) */
private String width;
/** 厚度(mm可为区间文本) */
private String thickness;
/** 宽度公差 */
private String widthTolerance;
/** 厚度公差 */
private String thicknessTolerance;
/** 重量(T) */
private BigDecimal weight;
/** 数量(件/卷数) */
private Integer quantity;
/** 供货商 */
private String supplier;
/** 备注 */
private String remark;
}

View File

@@ -0,0 +1,45 @@
package com.klp.erp.domain.vo;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 采购计划左侧「合同列表」视图对象crm_order + 该合同已有的采购计划数。
*
* @author klp
* @date 2026-06-25
*/
@Data
public class ErpContractOptionVo implements Serializable {
private static final long serialVersionUID = 1L;
/** 销售合同IDcrm_order.order_id */
private Long orderId;
/** 订单编号 */
private String orderCode;
/** 合同号 */
private String contractCode;
/** 合同名称 */
private String contractName;
/** 需方(客户) */
private String customer;
/** 供方 */
private String supplier;
/** 订单总金额 */
private BigDecimal orderAmount;
/** 销售员 */
private String salesman;
/** 该合同已挂接的采购计划数 */
private Integer planCount;
}

View File

@@ -0,0 +1,31 @@
package com.klp.erp.domain.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 采购计划审核日志视图对象
*
* @author klp
* @date 2026-06-25
*/
@Data
public class ErpPurchasePlanAuditLogVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long logId;
private Long planId;
/** 审核结果: 1-通过 2-驳回 */
private String auditStatus;
private String auditOpinion;
private String auditor;
private Date auditTime;
}

View File

@@ -0,0 +1,51 @@
package com.klp.erp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* 采购计划到货导入模板(对应到货 Excel一行一卷
*
* 列:日期 牌号 规格 卷号 单卷重量 车号 数量 件数 销售 钢厂到站
* 注:车号/数量/件数 为合并单元格,仅首行有值,导入时向下填充。
*
* @author klp
* @date 2026-06-22
*/
@Data
@ExcelIgnoreUnannotated
public class ErpPurchasePlanDeliveryImportVo {
@ExcelProperty("日期")
private String arrivalDate;
@ExcelProperty("牌号")
private String grade;
@ExcelProperty("规格")
private String spec;
@ExcelProperty("卷号")
private String coilNo;
@ExcelProperty("单卷重量")
private BigDecimal coilWeight;
@ExcelProperty("车号")
private String truckNo;
@ExcelProperty("数量")
private BigDecimal truckWeight;
@ExcelProperty("件数")
private Integer pieceCount;
@ExcelProperty("销售")
private String salesCode;
@ExcelProperty("钢厂到站")
private String arrivalStation;
}

View File

@@ -0,0 +1,62 @@
package com.klp.erp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 采购计划到货明细视图对象 erp_purchase_plan_delivery
*
* @author klp
* @date 2026-06-22
*/
@Data
@ExcelIgnoreUnannotated
public class ErpPurchasePlanDeliveryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "到货明细ID")
private Long deliveryId;
private Long planId;
@ExcelProperty(value = "日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date arrivalDate;
@ExcelProperty(value = "牌号")
private String grade;
@ExcelProperty(value = "规格")
private String spec;
@ExcelProperty(value = "卷号")
private String coilNo;
@ExcelProperty(value = "单卷重量")
private BigDecimal coilWeight;
@ExcelProperty(value = "车号")
private String truckNo;
@ExcelProperty(value = "数量")
private BigDecimal truckWeight;
@ExcelProperty(value = "件数")
private Integer pieceCount;
@ExcelProperty(value = "销售")
private String salesCode;
@ExcelProperty(value = "钢厂到站")
private String arrivalStation;
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,68 @@
package com.klp.erp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 采购计划明细视图对象 erp_purchase_plan_item
*
* @author klp
* @date 2026-06-22
*/
@Data
@ExcelIgnoreUnannotated
public class ErpPurchasePlanItemVo implements Serializable {
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "明细ID")
private Long itemId;
private Long planId;
@ExcelProperty(value = "产品")
private String productType;
@ExcelProperty(value = "材质")
private String material;
@ExcelProperty(value = "牌号")
private String grade;
@ExcelProperty(value = "卷号")
private String coilNo;
@ExcelProperty(value = "宽度")
private String width;
@ExcelProperty(value = "厚度")
private String thickness;
@ExcelProperty(value = "宽度公差")
private String widthTolerance;
@ExcelProperty(value = "厚度公差")
private String thicknessTolerance;
@ExcelProperty(value = "重量(T)")
private BigDecimal weight;
@ExcelProperty(value = "数量")
private Integer quantity;
@ExcelProperty(value = "已到货(T)")
private BigDecimal arrivedWeight;
/** 到货状态: 0未到货 1部分到货 2已到货 */
private String itemStatus;
@ExcelProperty(value = "供货商")
private String supplier;
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,79 @@
package com.klp.erp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 采购计划头视图对象 erp_purchase_plan
*
* @author klp
* @date 2026-06-22
*/
@Data
@ExcelIgnoreUnannotated
public class ErpPurchasePlanVo implements Serializable {
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "计划ID")
private Long planId;
@ExcelProperty(value = "采购计划号")
private String planNo;
/** 计划状态: 0-进行中 1-已完成归档 */
@ExcelProperty(value = "计划状态")
private String planStatus;
/** 审核状态: 0-待审核 1-通过 2-驳回 */
@ExcelProperty(value = "审核状态")
private String auditStatus;
@ExcelProperty(value = "审核意见")
private String auditOpinion;
@ExcelProperty(value = "审核人")
private String auditor;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "审核时间")
private Date auditTime;
@ExcelProperty(value = "供货商")
private String supplier;
@JsonFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "采购日期")
private Date purchaseDate;
@ExcelProperty(value = "计划总重量(T)")
private BigDecimal planWeight;
@ExcelProperty(value = "已到货重量(T)")
private BigDecimal arrivedWeight;
@ExcelProperty(value = "备注")
private String remark;
/** 到货进度百分比(0-100) */
private BigDecimal progress;
/** 明细行 */
private List<ErpPurchasePlanItemVo> items;
/** 关联销售合同ID */
private List<Long> orderIds;
/** 关联销售合同编号(展示用) */
private List<String> contractCodes;
/** 审核历史(每次审核/驳回留痕) */
private List<ErpPurchasePlanAuditLogVo> auditLogs;
}