Browse Source
删除旧版的采购计划的所有相关的文件，和其数据库的文件 删除旧版的采购计划子表的所有相关的文件，和其数据的文件 修改采购计划前端页面按照新版prd调整 按照新版prd 新增采购计划表purchase_plan 数据库新增5条测试数据 新增采购计划实体类 新增采购计划Controller 新增采购计划Mapper 新增采购计划Mapper.XML 新增采购计划Service接口 新增采购计划ServiceImpl实现类 按照新版prd 新增采购计划子表purchase_plan_child 数据库新增10条测试数据 新增采购计划子表实体类 新增采购计划子表Mapper 新增采购计划子表Mapper.XML 新增采购计划子表Service接口 新增采购计划子表ServiceImpl实现类 修改请购单的关联采购计划的方法，修改部分方法吗，采用最新的字段dev
8 changed files with 522 additions and 675 deletions
@ -1,383 +1,350 @@ |
|||||
package com.ruoyi.purchase.domain; |
package com.ruoyi.purchase.domain; |
||||
|
|
||||
import java.math.BigDecimal; |
import java.math.BigDecimal; |
||||
import java.util.ArrayList; |
|
||||
import java.util.Collections; |
|
||||
import java.util.List; |
|
||||
|
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder; |
import org.apache.commons.lang3.builder.ToStringBuilder; |
||||
import org.apache.commons.lang3.builder.ToStringStyle; |
import org.apache.commons.lang3.builder.ToStringStyle; |
||||
import com.ruoyi.common.annotation.Excel; |
import com.ruoyi.common.annotation.Excel; |
||||
import com.ruoyi.common.core.domain.BaseEntity; |
import com.ruoyi.common.core.domain.BaseEntity; |
||||
|
|
||||
/** |
/** |
||||
* 采购计划单物料信息对象 purchase_plan_child |
* 采购计划单子对象 purchase_plan_child |
||||
* |
* |
||||
* @author zhang |
* @author 刘晓旭 |
||||
* @date 2024-05-16 |
* @date 2024-11-15 |
||||
*/ |
*/ |
||||
public class PurchasePlanChild extends BaseEntity |
public class PurchasePlanChild extends BaseEntity |
||||
{ |
{ |
||||
private static final long serialVersionUID = 1L; |
private static final long serialVersionUID = 1L; |
||||
public List<PurchaseQuoteChild> parseSupplierMaterialCombinations; |
|
||||
|
|
||||
/** 采购计划物料清单索引 */ |
/** 采购计划子表id */ |
||||
private Long purchasePlanChildId; |
private Long purchasePlanChildId; |
||||
|
|
||||
/** 关联采购计划编号字段 */ |
/** 采购计划编号 */ |
||||
@Excel(name = "关联采购计划编号字段") |
@Excel(name = "采购计划编号") |
||||
private String purchasePlanCode; |
private String purchasePlanCode; |
||||
|
|
||||
/** 物料表中的id */ |
/** 采购计划状态(0待申请、1部分申请、2全部申请、3全部作废) */ |
||||
@Excel(name = "物料表中的id") |
@Excel(name = "采购计划状态(0待申请、1部分申请、2全部申请、3全部作废)") |
||||
private Long materialId; |
private String purchasePlanStatus; |
||||
|
|
||||
/** 物料表中的编号 */ |
/** 关联单号 */ |
||||
@Excel(name = "物料表中的编号") |
@Excel(name = "关联单号") |
||||
private String materialCode; |
private String correlationCode; |
||||
|
|
||||
/** 物料的名称 */ |
/** 采购来源(1生产单、2请购单、3开发修改单) */ |
||||
@Excel(name = "物料的名称") |
@Excel(name = "采购来源(1生产单、2请购单、3开发修改单)") |
||||
private String materialName; |
private String purchasePlanType; |
||||
|
|
||||
/** 物料的类型 */ |
/** 料号 */ |
||||
@Excel(name = "物料的类型") |
@Excel(name = "料号") |
||||
private String materialType; |
private String materialNo; |
||||
|
|
||||
/** 物料的加工方式 */ |
/** 物料名称 */ |
||||
@Excel(name = "物料的加工方式") |
@Excel(name = "物料名称") |
||||
private String processMethod; |
private String materialName; |
||||
|
|
||||
/** 物料的品牌 */ |
/** 物料类型 */ |
||||
@Excel(name = "物料的品牌") |
@Excel(name = "物料类型") |
||||
private String brand; |
private String materialType; |
||||
|
|
||||
/** 物料的图片 */ |
/** 物料图片地址 */ |
||||
@Excel(name = "物料的图片") |
@Excel(name = "物料图片地址") |
||||
private String photoUrl; |
private String materialPhotourl; |
||||
|
|
||||
/** 物料的描述 */ |
/** 物料品牌 */ |
||||
@Excel(name = "物料的描述") |
@Excel(name = "物料品牌") |
||||
private String describe; |
private String materialBrand; |
||||
|
|
||||
|
/** 物料单位 */ |
||||
@Excel(name = "物料单位") |
@Excel(name = "物料单位") |
||||
private String unit; |
private String materialUnit; |
||||
@Excel(name = "物料入库部门") |
|
||||
private String warehouseDept; |
|
||||
|
|
||||
/** 采购计划数 */ |
/** 物料描述 */ |
||||
@Excel(name = "采购计划数") |
@Excel(name = "物料描述") |
||||
private Double materialNum; |
private String materialDescribe; |
||||
|
|
||||
/** 物料的对外报价 */ |
/** 物料加工方式 */ |
||||
private Long materialSole; |
@Excel(name = "物料加工方式") |
||||
|
private String materialProcessMethod; |
||||
|
|
||||
/** 物料的不含税单价(RMB) */ |
/** 物料型号 */ |
||||
private BigDecimal materialRmb; |
@Excel(name = "物料型号") |
||||
|
private String materialModel; |
||||
|
|
||||
/** 物料的含税单价(RMB) */ |
/** 入库部门(0仓库、1采购) */ |
||||
private BigDecimal materialNoRmb; |
@Excel(name = "入库部门(0仓库、1采购)") |
||||
|
private String warehouseDept; |
||||
|
|
||||
/*供应商编号*/ |
/** 物料不含税总价(RMB) */ |
||||
private String supplierCode; |
@Excel(name = "物料不含税总价(RMB)") |
||||
/** 物料供应商 */ |
private BigDecimal materialNormbSum; |
||||
private String supplierName; |
|
||||
|
|
||||
/** 使用状态 */ |
/** 物料含税总价(RMB) */ |
||||
private String useStatus; |
@Excel(name = "物料含税总价(RMB)") |
||||
|
private BigDecimal materialRmbSum; |
||||
|
|
||||
/** 审核状态 */ |
/** 计划采购数 */ |
||||
private String auditStatus; |
@Excel(name = "计划采购数") |
||||
|
private Integer planPurchaseNum; |
||||
|
|
||||
/** 删除标志 */ |
/** 待采购数 */ |
||||
private String delFlag; |
@Excel(name = "待采购数") |
||||
/** 关联供应商编号 */ |
private Integer purchaseNum; |
||||
private String supplierCodes; |
|
||||
/** 关联采购报价单编号 */ |
|
||||
private String correlationCodes; |
|
||||
|
|
||||
private String planCodes; |
/** 实际采购数 */ |
||||
private List<PurchaseQuoteChild> purchaseSupplierList; |
@Excel(name = "实际采购数") |
||||
|
private Integer actualPurchaseNum; |
||||
|
|
||||
public String getSupplierCodes() { |
/** 共享库存占用数 */ |
||||
return supplierCodes; |
@Excel(name = "共享库存占用数") |
||||
} |
private Integer sharedInventoryOccupancyNum; |
||||
|
|
||||
public void setSupplierCodes(String supplierCodes) { |
|
||||
this.supplierCodes = supplierCodes; |
|
||||
} |
|
||||
|
|
||||
public String getCorrelationCodes() { |
/** 作废数 */ |
||||
return correlationCodes; |
@Excel(name = "作废数") |
||||
} |
private Integer cancelNum; |
||||
|
|
||||
public void setCorrelationCodes(String correlationCodes) { |
/** 删除标志 0 启用 1逻辑删除 */ |
||||
this.correlationCodes = correlationCodes; |
private String delFlag; |
||||
} |
|
||||
|
|
||||
public void setPurchasePlanChildId(Long purchasePlanChildId) |
public void setPurchasePlanChildId(Long purchasePlanChildId) |
||||
{ |
{ |
||||
this.purchasePlanChildId = purchasePlanChildId; |
this.purchasePlanChildId = purchasePlanChildId; |
||||
} |
} |
||||
|
|
||||
public Long getPurchasePlanChildId() |
public Long getPurchasePlanChildId() |
||||
{ |
{ |
||||
return purchasePlanChildId; |
return purchasePlanChildId; |
||||
} |
} |
||||
public void setPurchasePlanCode(String purchasePlanCode) |
public void setPurchasePlanCode(String purchasePlanCode) |
||||
{ |
{ |
||||
this.purchasePlanCode = purchasePlanCode; |
this.purchasePlanCode = purchasePlanCode; |
||||
} |
} |
||||
|
|
||||
public String getPurchasePlanCode() |
public String getPurchasePlanCode() |
||||
{ |
{ |
||||
return purchasePlanCode; |
return purchasePlanCode; |
||||
} |
} |
||||
public void setMaterialId(Long materialId) |
public void setPurchasePlanStatus(String purchasePlanStatus) |
||||
{ |
{ |
||||
this.materialId = materialId; |
this.purchasePlanStatus = purchasePlanStatus; |
||||
} |
} |
||||
|
|
||||
public Long getMaterialId() |
public String getPurchasePlanStatus() |
||||
{ |
{ |
||||
return materialId; |
return purchasePlanStatus; |
||||
} |
} |
||||
public void setMaterialCode(String materialCode) |
public void setCorrelationCode(String correlationCode) |
||||
{ |
{ |
||||
this.materialCode = materialCode; |
this.correlationCode = correlationCode; |
||||
} |
} |
||||
|
|
||||
public String getMaterialCode() |
public String getCorrelationCode() |
||||
{ |
{ |
||||
return materialCode; |
return correlationCode; |
||||
} |
} |
||||
public void setMaterialName(String materialName) |
public void setPurchasePlanType(String purchasePlanType) |
||||
{ |
{ |
||||
this.materialName = materialName; |
this.purchasePlanType = purchasePlanType; |
||||
} |
} |
||||
|
|
||||
public String getMaterialName() |
public String getPurchasePlanType() |
||||
{ |
{ |
||||
return materialName; |
return purchasePlanType; |
||||
} |
} |
||||
public void setMaterialType(String materialType) |
public void setMaterialNo(String materialNo) |
||||
{ |
{ |
||||
this.materialType = materialType; |
this.materialNo = materialNo; |
||||
} |
} |
||||
|
|
||||
public String getMaterialType() |
public String getMaterialNo() |
||||
{ |
{ |
||||
return materialType; |
return materialNo; |
||||
} |
} |
||||
public void setProcessMethod(String processMethod) |
public void setMaterialName(String materialName) |
||||
{ |
{ |
||||
this.processMethod = processMethod; |
this.materialName = materialName; |
||||
} |
} |
||||
|
|
||||
public String getProcessMethod() |
public String getMaterialName() |
||||
{ |
{ |
||||
return processMethod; |
return materialName; |
||||
} |
} |
||||
public void setBrand(String brand) |
public void setMaterialType(String materialType) |
||||
{ |
{ |
||||
this.brand = brand; |
this.materialType = materialType; |
||||
} |
} |
||||
|
|
||||
public String getBrand() |
public String getMaterialType() |
||||
{ |
{ |
||||
return brand; |
return materialType; |
||||
} |
} |
||||
public void setPhotoUrl(String photoUrl) |
public void setMaterialPhotourl(String materialPhotourl) |
||||
{ |
{ |
||||
this.photoUrl = photoUrl; |
this.materialPhotourl = materialPhotourl; |
||||
} |
} |
||||
|
|
||||
public String getPhotoUrl() |
public String getMaterialPhotourl() |
||||
{ |
{ |
||||
return photoUrl; |
return materialPhotourl; |
||||
} |
} |
||||
public void setDescribe(String describe) |
public void setMaterialBrand(String materialBrand) |
||||
{ |
{ |
||||
this.describe = describe; |
this.materialBrand = materialBrand; |
||||
} |
} |
||||
|
|
||||
public String getDescribe() |
public String getMaterialBrand() |
||||
{ |
{ |
||||
return describe; |
return materialBrand; |
||||
} |
} |
||||
|
public void setMaterialUnit(String materialUnit) |
||||
public String getUnit() { |
{ |
||||
return unit; |
this.materialUnit = materialUnit; |
||||
} |
|
||||
|
|
||||
public void setUnit(String unit) { |
|
||||
this.unit = unit; |
|
||||
} |
|
||||
|
|
||||
public Double getMaterialNum() { |
|
||||
return materialNum; |
|
||||
} |
} |
||||
|
|
||||
public void setMaterialNum(Double materialNum) { |
public String getMaterialUnit() |
||||
this.materialNum = materialNum; |
{ |
||||
|
return materialUnit; |
||||
} |
} |
||||
|
public void setMaterialDescribe(String materialDescribe) |
||||
|
{ |
||||
|
this.materialDescribe = materialDescribe; |
||||
public List<PurchaseQuoteChild> getParseSupplierMaterialCombinations() { |
|
||||
return parseSupplierMaterialCombinations; |
|
||||
} |
} |
||||
|
|
||||
public void setParseSupplierMaterialCombinations(List<PurchaseQuoteChild> parseSupplierMaterialCombinations) { |
public String getMaterialDescribe() |
||||
this.parseSupplierMaterialCombinations = parseSupplierMaterialCombinations; |
{ |
||||
|
return materialDescribe; |
||||
} |
} |
||||
|
public void setMaterialProcessMethod(String materialProcessMethod) |
||||
public void setMaterialSole(Long materialSole) |
|
||||
{ |
{ |
||||
this.materialSole = materialSole; |
this.materialProcessMethod = materialProcessMethod; |
||||
} |
} |
||||
|
|
||||
public Long getMaterialSole() |
public String getMaterialProcessMethod() |
||||
{ |
{ |
||||
return materialSole; |
return materialProcessMethod; |
||||
} |
} |
||||
public void setMaterialRmb(BigDecimal materialRmb) |
public void setMaterialModel(String materialModel) |
||||
{ |
{ |
||||
this.materialRmb = materialRmb; |
this.materialModel = materialModel; |
||||
} |
} |
||||
|
|
||||
public BigDecimal getMaterialRmb() |
public String getMaterialModel() |
||||
{ |
{ |
||||
return materialRmb; |
return materialModel; |
||||
} |
} |
||||
public void setMaterialNoRmb(BigDecimal materialNoRmb) |
public void setWarehouseDept(String warehouseDept) |
||||
{ |
{ |
||||
this.materialNoRmb = materialNoRmb; |
this.warehouseDept = warehouseDept; |
||||
} |
} |
||||
|
|
||||
public BigDecimal getMaterialNoRmb() |
public String getWarehouseDept() |
||||
{ |
{ |
||||
return materialNoRmb; |
return warehouseDept; |
||||
} |
} |
||||
public void setUseStatus(String useStatus) |
public void setMaterialNormbSum(BigDecimal materialNormbSum) |
||||
{ |
{ |
||||
this.useStatus = useStatus; |
this.materialNormbSum = materialNormbSum; |
||||
} |
} |
||||
|
|
||||
public String getSupplierCode() { |
public BigDecimal getMaterialNormbSum() |
||||
return supplierCode; |
{ |
||||
|
return materialNormbSum; |
||||
} |
} |
||||
|
public void setMaterialRmbSum(BigDecimal materialRmbSum) |
||||
public void setSupplierCode(String supplierCode) { |
{ |
||||
this.supplierCode = supplierCode; |
this.materialRmbSum = materialRmbSum; |
||||
} |
} |
||||
|
|
||||
public String getSupplierName() { |
public BigDecimal getMaterialRmbSum() |
||||
return supplierName; |
{ |
||||
|
return materialRmbSum; |
||||
} |
} |
||||
|
public void setPlanPurchaseNum(Integer planPurchaseNum) |
||||
public void setSupplierName(String supplierName) { |
{ |
||||
this.supplierName = supplierName; |
this.planPurchaseNum = planPurchaseNum; |
||||
} |
} |
||||
|
|
||||
public String getWarehouseDept() { |
public Integer getPlanPurchaseNum() |
||||
return warehouseDept; |
{ |
||||
|
return planPurchaseNum; |
||||
} |
} |
||||
|
public void setPurchaseNum(Integer purchaseNum) |
||||
public void setWarehouseDept(String warehouseDept) { |
{ |
||||
this.warehouseDept = warehouseDept; |
this.purchaseNum = purchaseNum; |
||||
} |
} |
||||
|
|
||||
public List<PurchaseQuoteChild> getPurchaseSupplierList() { |
public Integer getPurchaseNum() |
||||
return purchaseSupplierList; |
{ |
||||
|
return purchaseNum; |
||||
} |
} |
||||
|
public void setActualPurchaseNum(Integer actualPurchaseNum) |
||||
public void setPurchaseSupplierList(List<PurchaseQuoteChild> purchaseSupplierList) { |
{ |
||||
this.purchaseSupplierList = purchaseSupplierList; |
this.actualPurchaseNum = actualPurchaseNum; |
||||
} |
} |
||||
|
|
||||
public String getPlanCodes() { |
public Integer getActualPurchaseNum() |
||||
return planCodes; |
{ |
||||
|
return actualPurchaseNum; |
||||
} |
} |
||||
|
public void setSharedInventoryOccupancyNum(Integer sharedInventoryOccupancyNum) |
||||
public void setPlanCodes(String planCodes) { |
{ |
||||
this.planCodes = planCodes; |
this.sharedInventoryOccupancyNum = sharedInventoryOccupancyNum; |
||||
} |
} |
||||
|
|
||||
public String getUseStatus() |
public Integer getSharedInventoryOccupancyNum() |
||||
{ |
{ |
||||
return useStatus; |
return sharedInventoryOccupancyNum; |
||||
} |
} |
||||
public void setAuditStatus(String auditStatus) |
public void setCancelNum(Integer cancelNum) |
||||
{ |
{ |
||||
this.auditStatus = auditStatus; |
this.cancelNum = cancelNum; |
||||
} |
} |
||||
|
|
||||
public String getAuditStatus() |
public Integer getCancelNum() |
||||
{ |
{ |
||||
return auditStatus; |
return cancelNum; |
||||
} |
} |
||||
public void setDelFlag(String delFlag) |
public void setDelFlag(String delFlag) |
||||
{ |
{ |
||||
this.delFlag = delFlag; |
this.delFlag = delFlag; |
||||
} |
} |
||||
|
|
||||
|
|
||||
|
|
||||
public String getDelFlag() |
public String getDelFlag() |
||||
{ |
{ |
||||
return delFlag; |
return delFlag; |
||||
} |
} |
||||
|
|
||||
public List<PurchaseQuoteChild> parseSupplierMaterialCombinations(String combinations) { |
|
||||
if (combinations == null || combinations.isEmpty()) { |
|
||||
return Collections.emptyList(); |
|
||||
} |
|
||||
//materialCode|purchaseQuoteCode|supplierCode|supplierName|materialName|materialNoRmb|materialRmb|purchasePlanCode|correlationCode
|
|
||||
/* 1. 料号 | 2. 供应商报价编号 | 3. 供应商编号 | 4.供应商名称 | 5. 物料名称 | 6. 物料含税单价(RMB) | 7. 物料不含税单价(RMB) | 8关联采购计划单号 | 9关联相关订单号 */ |
|
||||
List<PurchaseQuoteChild> purchaseSupplierList = new ArrayList<>(); |
|
||||
String[] split = combinations.split(","); |
|
||||
for (int i = 0; i < split.length; i++) { |
|
||||
String[] split1 = split[i].split("\\|"); |
|
||||
PurchaseQuoteChild purchaseQuoteChild = new PurchaseQuoteChild(); |
|
||||
purchaseQuoteChild.setMaterialCode(split1[0]); |
|
||||
purchaseQuoteChild.setPurchaseQuoteCode(split1[1]); |
|
||||
purchaseQuoteChild.setSupplierCode(split1[2]); |
|
||||
purchaseQuoteChild.setSupplierName(split1[3]); |
|
||||
purchaseQuoteChild.setMaterialName(split1[4]); |
|
||||
purchaseQuoteChild.setMaterialNoRmb(BigDecimal.valueOf(Float.parseFloat(split1[5]))); |
|
||||
purchaseQuoteChild.setMaterialRmb(BigDecimal.valueOf(Float.parseFloat(split1[6]))); |
|
||||
purchaseQuoteChild.setPurchasePlanCode(split1[7]); |
|
||||
purchaseQuoteChild.setCorrelationCode(split1[8]); |
|
||||
purchaseSupplierList.add(purchaseQuoteChild); |
|
||||
} |
|
||||
return purchaseSupplierList; |
|
||||
} |
|
||||
@Override |
@Override |
||||
public String toString() { |
public String toString() { |
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
||||
.append("purchasePlanChildId", getPurchasePlanChildId()) |
.append("purchasePlanChildId", getPurchasePlanChildId()) |
||||
.append("purchasePlanCode", getPurchasePlanCode()) |
.append("purchasePlanCode", getPurchasePlanCode()) |
||||
.append("materialId", getMaterialId()) |
.append("purchasePlanStatus", getPurchasePlanStatus()) |
||||
.append("materialCode", getMaterialCode()) |
.append("correlationCode", getCorrelationCode()) |
||||
.append("materialName", getMaterialName()) |
.append("purchasePlanType", getPurchasePlanType()) |
||||
.append("materialType", getMaterialType()) |
.append("materialNo", getMaterialNo()) |
||||
.append("processMethod", getProcessMethod()) |
.append("materialName", getMaterialName()) |
||||
.append("brand", getBrand()) |
.append("materialType", getMaterialType()) |
||||
.append("photoUrl", getPhotoUrl()) |
.append("materialPhotourl", getMaterialPhotourl()) |
||||
.append("describe", getDescribe()) |
.append("materialBrand", getMaterialBrand()) |
||||
.append("materialNum", getMaterialNum()) |
.append("materialUnit", getMaterialUnit()) |
||||
.append("materialSole", getMaterialSole()) |
.append("materialDescribe", getMaterialDescribe()) |
||||
.append("materialRmb", getMaterialRmb()) |
.append("materialProcessMethod", getMaterialProcessMethod()) |
||||
.append("materialNoRmb", getMaterialNoRmb()) |
.append("materialModel", getMaterialModel()) |
||||
.append("createBy", getCreateBy()) |
.append("warehouseDept", getWarehouseDept()) |
||||
.append("createTime", getCreateTime()) |
.append("materialNormbSum", getMaterialNormbSum()) |
||||
.append("updateBy", getUpdateBy()) |
.append("materialRmbSum", getMaterialRmbSum()) |
||||
.append("updateTime", getUpdateTime()) |
.append("planPurchaseNum", getPlanPurchaseNum()) |
||||
.append("remark", getRemark()) |
.append("purchaseNum", getPurchaseNum()) |
||||
.append("useStatus", getUseStatus()) |
.append("actualPurchaseNum", getActualPurchaseNum()) |
||||
.append("auditStatus", getAuditStatus()) |
.append("sharedInventoryOccupancyNum", getSharedInventoryOccupancyNum()) |
||||
.append("delFlag", getDelFlag()) |
.append("cancelNum", getCancelNum()) |
||||
.toString(); |
.append("createBy", getCreateBy()) |
||||
|
.append("createTime", getCreateTime()) |
||||
|
.append("updateBy", getUpdateBy()) |
||||
|
.append("updateTime", getUpdateTime()) |
||||
|
.append("remark", getRemark()) |
||||
|
.append("delFlag", getDelFlag()) |
||||
|
.toString(); |
||||
} |
} |
||||
} |
} |
||||
|
|||||
Loading…
Reference in new issue