diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java index d1e987fe..751969ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java @@ -42,6 +42,11 @@ public class PurchaseQuoteChild extends BaseEntity @Excel(name = "物料的加工方式") private String processMethod; + + /** 物料的型号 */ + @Excel(name = "物料的型号") + private String materialModel; + /** 物料的品牌 */ @Excel(name = "物料的品牌") private String brand; @@ -294,6 +299,15 @@ public class PurchaseQuoteChild extends BaseEntity public String getCorrelationCode() { return correlationCode; } + + public String getMaterialModel() { + return materialModel; + } + + public void setMaterialModel(String materialModel) { + this.materialModel = materialModel; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -304,6 +318,7 @@ public class PurchaseQuoteChild extends BaseEntity .append("materialName", getMaterialName()) .append("materialType", getMaterialType()) .append("processMethod", getProcessMethod()) + .append("materialModel", getMaterialModel()) .append("brand", getBrand()) .append("photoUrl", getPhotoUrl()) .append("describe", getDescribe()) diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml index d0d84d89..a8a70d03 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select purchase_quote_child_id, purchase_quote_code, material_id, material_code, - material_name, material_type, processMethod, brand, photoUrl, `describe`, tax_rate, usd_rate, + material_name, material_type, processMethod, material_model, brand, photoUrl, `describe`, tax_rate, usd_rate, material_num, material_sole, material_rmb, material_noRmb,supplier_code, supplier_name, create_by, create_time, update_by, update_time, remark, use_status, audit_status, del_flag from purchase_quote_child @@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"