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

refactor(wms): 移除产品BOM相关模块和采购计划功能模块

Browse Source 
- 删除产品BOM（Bill of Materials）相关的控制器、服务、实体类及映射文件
- 移除了WmsProductBomController控制器及相关接口实现
- 清理了IWmsProductBomService服务接口与WmsProductBomServiceImpl实现类
- 移除了WmsProductBom实体类及其对应的BO/VO对象- 删除WmsProductBomMapper接口及XML配置文件
- 更新WmsMaterialCoilServiceImpl依赖注入，移除对IWmsProductBomService的引用
- 调整WmsCoilPendingActionMapper.xml路径从wms目录迁移至klp目录下
- 整理采购计划相关模块代码结构，确保模块清晰分离
This commit is contained in:
Joshi
2025-11-13 13:24:09 +08:00
parent 1bccfe57d8
commit 9c88669751
28 changed files with 65 additions and 1884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
klp-wms/src/main/java/com/klp/domain/WmsProductBom.java
View File

@@ -1,49 +0,0 @@
package com.klp.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 产品BOM（产品-原材料清单）对象 wms_product_bom
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("wms_product_bom")
public class WmsProductBom extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* BOM主键ID
*/
@TableId(value = "bom_id")
private Long bomId;
/**
* 产品ID
*/
private Long productId;
/**
* 原材料ID
*/
private Long rawMaterialId;
/**
* 每个产品所需原材料数量
*/
private BigDecimal quantity;
/**
* 单位
*/
private String unit;
/**
* 备注
*/
private String remark;
}

57
klp-wms/src/main/java/com/klp/domain/WmsPurchasePlan.java
View File

@@ -1,57 +0,0 @@
package com.klp.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 采购计划主对象 wms_purchase_plan
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("wms_purchase_plan")
public class WmsPurchasePlan extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 采购计划ID
*/
@TableId(value = "plan_id")
private Long planId;
/**
* 采购计划编号
*/
private String planCode;
/**
* 负责人
*/
private String owner;
/**
* 关联订单ID
*/
private Long orderId;
/**
* 状态（0=新建，1=待审核，2=已审核，3=已完成，4=已取消）
*/
private Integer status;
/**
* 附件信息
*/
private String attachmentInfo;
/**
* 备注
*/
private String remark;
/**
* 删除标志（0=正常，1=已删除）
*/
@TableLogic
private Integer delFlag;
}

81
klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
View File

@@ -1,81 +0,0 @@
package com.klp.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 采购计划明细对象 wms_purchase_plan_detail
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("wms_purchase_plan_detail")
public class WmsPurchasePlanDetail extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 明细ID
*/
@TableId(value = "detail_id")
private Long detailId;
/**
* 采购计划ID
*/
private Long planId;
/**
* 原材料ID
*/
private Long rawMaterialId;
/**
* 负责人
*/
private String owner;
/**
* 计划采购数量
*/
private BigDecimal quantity;
/**
* 单位
*/
private String unit;
/**
* 附件
*/
private String annex;
/**
* 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
*/
private Integer status;
/**
* 备注
*/
private String remark;
/**
* 删除标志（0=正常，1=已删除）
*/
@TableLogic
private Integer delFlag;
/**
* 供应商ID
*/
private Long supplierId;
/**
* 合同ID
*/
private Long contractId;
/**
* 详情编号
*/
private String detailCode;
}

58
klp-wms/src/main/java/com/klp/domain/bo/WmsProductBomBo.java
View File

@@ -1,58 +0,0 @@
package com.klp.domain.bo;
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 java.math.BigDecimal;
/**
* 产品BOM（产品-原材料清单）业务对象 wms_product_bom
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WmsProductBomBo extends BaseEntity {
/**
* BOM主键ID
*/
private Long bomId;
/**
* 产品ID
*/
@NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long productId;
/**
* 原材料ID
*/
@NotNull(message = "原材料ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long rawMaterialId;
/**
* 每个产品所需原材料数量
*/
@NotNull(message = "每个产品所需原材料数量不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal quantity;
/**
* 单位
*/
@NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
private String unit;
/**
* 备注
*/
private String remark;
}

58
klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanBo.java
View File

@@ -1,58 +0,0 @@
package com.klp.domain.bo;
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.*;
/**
* 采购计划主业务对象 wms_purchase_plan
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WmsPurchasePlanBo extends BaseEntity {
/**
* 采购计划ID
*/
private Long planId;
/**
* 采购计划编号
*/
private String planCode;
/**
* 负责人
*/
private String owner;
/**
* 关联订单ID
*/
private Long orderId;
/**
* 状态（0=新建，1=待审核，2=已审核，3=已完成，4=已取消）
*/
private Integer status;
/**
* 附件信息
*/
private String attachmentInfo;
/**
* 备注
*/
private String remark;
}

84
klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
View File

@@ -1,84 +0,0 @@
package com.klp.domain.bo;
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 java.math.BigDecimal;
/**
* 采购计划明细业务对象 wms_purchase_plan_detail
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WmsPurchasePlanDetailBo extends BaseEntity {
/**
* 明细ID
*/
private Long detailId;
/**
* 采购计划ID
*/
private Long planId;
/**
* 原材料ID
*/
private Long rawMaterialId;
/**
* 负责人
*/
private String owner;
/**
* 计划采购数量
*/
private BigDecimal quantity;
/**
* 单位
*/
private String unit;
/**
* 附件
*/
private String annex;
/**
* 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
*/
private Integer status;
/**
* 备注
*/
private String remark;
/**
* 供应商ID
*/
private Long supplierId;
/**
* 合同ID
*/
private Long contractId;
/**
* 详情编号
*/
private String detailCode;
}

77
klp-wms/src/main/java/com/klp/domain/vo/WmsProductBomVo.java
View File

@@ -1,77 +0,0 @@
package com.klp.domain.vo;
import java.math.BigDecimal;
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 lombok.Data;
/**
* 产品BOM（产品-原材料清单）视图对象 wms_product_bom
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@ExcelIgnoreUnannotated
public class WmsProductBomVo {
private static final long serialVersionUID = 1L;
/**
* BOM主键ID
*/
@ExcelProperty(value = "BOM主键ID")
private Long bomId;
/**
* 产品ID
*/
@ExcelProperty(value = "产品ID")
private Long productId;
/**
* 原材料ID
*/
@ExcelProperty(value = "原材料ID")
private Long rawMaterialId;
/**
* 每个产品所需原材料数量
*/
@ExcelProperty(value = "每个产品所需原材料数量")
private BigDecimal quantity;
/**
* 单位
*/
@ExcelProperty(value = "单位")
private String unit;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 产品名称
*/
private String productName;
/**
* 产品编码
*/
private String productCode;
/**
* 原材料名称
*/
private String rawMaterialName;
/**
* 原材料编码
*/
private String rawMaterialCode;
}

119
klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java
View File

@@ -1,119 +0,0 @@
package com.klp.domain.vo;
import java.math.BigDecimal;
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 lombok.Data;
/**
* 采购计划明细视图对象 wms_purchase_plan_detail
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@ExcelIgnoreUnannotated
public class WmsPurchasePlanDetailVo {
private static final long serialVersionUID = 1L;
/**
* 明细ID
*/
@ExcelProperty(value = "明细ID")
private Long detailId;
/**
* 采购计划ID
*/
@ExcelProperty(value = "采购计划ID")
private Long planId;
/**
* 原材料ID
*/
@ExcelProperty(value = "原材料ID")
private Long rawMaterialId;
/**
* 负责人
*/
@ExcelProperty(value = "负责人")
private String owner;
/**
* 计划采购数量
*/
@ExcelProperty(value = "计划采购数量")
private BigDecimal quantity;
/**
* 单位
*/
@ExcelProperty(value = "单位")
private String unit;
/**
* 附件
*/
@ExcelProperty(value = "附件")
private String annex;
/**
* 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
*/
@ExcelProperty(value = "状态")
private Integer status;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
@ExcelProperty(value = "原材料名称")
private String rawMaterialName;
@ExcelProperty(value = "原材料编码")
private String rawMaterialCode;
/**
* 需求量
*/
private BigDecimal demand;
/**
* 库存量
*/
private BigDecimal inventory;
/**
* 在途量
*/
private BigDecimal onTheWay;
/**
* 供应商ID
*/
private Long supplierId;
/**
* 合同ID
*/
private Long contractId;
/**
* 供应商名称
*/
private String supplierName;
/**
* 合同编号
*/
private String contractNo;
/**
* 详情编号
*/
private String detailCode;
}

72
klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanVo.java
View File

@@ -1,72 +0,0 @@
package com.klp.domain.vo;
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 lombok.Data;
import java.util.List;
/**
* 采购计划主视图对象 wms_purchase_plan
*
* @author Joshi
* @date 2025-07-18
*/
@Data
@ExcelIgnoreUnannotated
public class WmsPurchasePlanVo {
private static final long serialVersionUID = 1L;
/**
* 采购计划ID
*/
@ExcelProperty(value = "采购计划ID")
private Long planId;
/**
* 采购计划编号
*/
@ExcelProperty(value = "采购计划编号")
private String planCode;
/**
* 负责人
*/
@ExcelProperty(value = "负责人")
private String owner;
/**
* 关联订单ID
*/
@ExcelProperty(value = "关联订单ID")
private Long orderId;
/**
* 状态（0=新建，1=待审核，2=已审核，3=已完成，4=已取消）
*/
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0==新建，1=待审核，2=已审核，3=已完成，4=已取消")
private Integer status;
/**
* 附件信息
*/
@ExcelProperty(value = "附件信息")
private String attachmentInfo;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 采购计划明细列表
*/
private List<WmsPurchasePlanDetailVo> detailList;
}