diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 73738f32..ded60d9a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -174,7 +174,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); List list = mterialInfoMapper.selectList(page,queryWrapper); IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java index 334bf3c6..348263a9 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java @@ -177,6 +177,10 @@ public class BlWarehouseMaterialInfo implements Serializable { private java.lang.String tagType; @TableField(exist = false) private java.lang.String materialImg; + @TableField(exist = false) + private java.lang.String salesUnitPrice; + @TableField(exist = false) + private java.lang.String referenceUnitPrice; @TableField(exist = false) private java.lang.String wlParamInfo;//查询物料信息参数,可多个查询 diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml index f2f397e8..c4a53bd5 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml @@ -26,6 +26,8 @@ b.upper_limit, b.lower_limit, b.tag_type, + b.sales_unit_price, + b.reference_unit_price, b.material_img, c.item_text as tagName from nu_warehouse_material_info a