diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java index f84e958..0c73fc3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java @@ -75,6 +75,14 @@ public class SupplierBindMaterial extends BaseEntity { @ApiModelProperty(value = "规格") private String size; + /** 销售价 */ + @ApiModelProperty(value = "销售价") + private Long salePrice; + + /** 进价 */ + @ApiModelProperty(value = "进价") + private Long unitPrice; + @Excel(name = "类别名称") @ApiModelProperty(value = "类别名称") private String materialTypeName; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml index 2ff95e4..4bca402 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml @@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -25,10 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select cm.material_id, cm.material_code, cm.material_name, cm.size, cmt.material_type_name, isu.supplier_name, + select cm.material_id, cm.material_code, cm.material_name, cm.size, cm.sale_price, cm.unit_price, + cmt.material_type_name, isu.supplier_name, bc.canteen_name, ba.area_name, isbm.id, isbm.canteen_id, isbm.supplier_id, isbm.material_id, isbm.category_id, isbm.alternative_supplier, - isbm.if_supply, isbm.create_by, isbm.create_time, isbm.update_by, isbm.update_time, bc.canteen_name, - ba.area_name + isbm.if_supply, isbm.create_by, isbm.create_time, isbm.update_by, isbm.update_time from cook_material cm left join ims_supplier_bind_material isbm on cm.material_id = isbm.material_id left join cook_material_type cmt on cmt.material_type_id = cm.material_type_id