增加了入库时的查询搜索
This commit is contained in:
@@ -130,7 +130,7 @@ public class ReagentConsumables extends BaseEntity {
|
|||||||
@ApiModelProperty(value="reagentConsumableId")
|
@ApiModelProperty(value="reagentConsumableId")
|
||||||
private String reagentConsumableId;
|
private String reagentConsumableId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "存储期限")
|
// @ApiModelProperty(value = "存储期限")
|
||||||
private Integer storageLife;
|
// private Integer storageLife;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,7 +143,6 @@
|
|||||||
rm.alias,
|
rm.alias,
|
||||||
rm.remark,
|
rm.remark,
|
||||||
rm.configuration_concentration,
|
rm.configuration_concentration,
|
||||||
rm.storage_life,
|
|
||||||
rci.warning_information,
|
rci.warning_information,
|
||||||
r1.`status` as reference_material_status,
|
r1.`status` as reference_material_status,
|
||||||
r1.`id` as reference_material_id,
|
r1.`id` as reference_material_id,
|
||||||
|
|||||||
@@ -138,7 +138,7 @@
|
|||||||
and wc.warehousing_quantity = wc.total_quantity
|
and wc.warehousing_quantity = wc.total_quantity
|
||||||
</if>
|
</if>
|
||||||
<if test="keywords != null and keywords != ''">
|
<if test="keywords != null and keywords != ''">
|
||||||
and wc.reagent_consumable_name = #{keywords}
|
and wc.reagent_consumable_name like concat ('%',#{keywords} ,'%' )
|
||||||
</if>
|
</if>
|
||||||
<if test="category != null and category != ''">
|
<if test="category != null and category != ''">
|
||||||
and rc.category = #{category}
|
and rc.category = #{category}
|
||||||
|
|||||||
Reference in New Issue
Block a user