模块:试剂流向追踪
修改:残余量增加单位
提出:秦老师
| | |
| | | int favorCount(Map params); |
| | | List<SysReagent> favorList(Map params); |
| | | Map getSysReagentDetail(String id); |
| | | |
| | | String getReagentUnitByReagentId(String reagentId); |
| | | } |
| | |
| | | <if test="productSn != null and productSn != ''"> |
| | | and sr.product_sn like concat("%", #{productSn} ,"%") |
| | | </if> |
| | | ORDER BY f.create_time desc,sr.create_time desc |
| | | <if test="first != null and pageSize != null"> |
| | | limit #{first}, #{pageSize} |
| | | </if> |
| | |
| | | |
| | | </select> |
| | | |
| | | <select id="getReagentUnitByReagentId" parameterType="java.lang.String" resultType="java.lang.String"> |
| | | SELECT bm.meta_value |
| | | from sys_reagent sr |
| | | LEFT JOIN base_meta bm on bm.id = sr.reagent_unit |
| | | where sr.valid_flag =1 |
| | | and bm.valid_flag = 1 |
| | | and sr.id = #{reagentId} |
| | | </select> |
| | | |
| | | |
| | | <select id="getSysReagentByCas2" parameterType="com.nanometer.smartlab.entity.SysReagent" resultMap="SysReagent"> |
| | | select * From sys_reagent where type=0 and valid_flag = 1 |
| | |
| | | int reagentCount(SysUser user, String name, String cas, String supplierId, String productSn); |
| | | |
| | | List<SysReagent> reagentList(SysUser user, String name, String cas, String supplierId, String productSn, int first, int pageSize); |
| | | |
| | | String getReagentUnitByReagentId(String reagentId); |
| | | } |
| | |
| | | return sysReagentDao.reagentList(params); |
| | | } |
| | | |
| | | @Override |
| | | public String getReagentUnitByReagentId(String reagentId) { |
| | | return sysReagentDao.getReagentUnitByReagentId(reagentId); |
| | | } |
| | | |
| | | |
| | | @Transactional(propagation = Propagation.REQUIRED) |
| | | public int getSysReagentTotalCount(String name, String cas, String supplierId,Integer type) { |
| | |
| | | <h:outputText value="#{row.operatestateName}" /> |
| | | </p:column> |
| | | <p:column headerText="残存量"> |
| | | <h:outputText value="#{row.remainder}" /> |
| | | <h:outputText value="#{row.remainder == null?'':''.concat(row.remainder).concat(sysReagentService.getReagentUnitByReagentId(row.reagent.id))}" rendered="#{row.operatestateName eq '仓库领用' ||row.operatestateName eq '仓库入库' }"/> |
| | | <h:outputText value="#{row.remainder == null?'':''.concat(row.remainder).concat('g')}" rendered="#{ row.operatestateName ne '仓库领用' and row.operatestateName ne '仓库入库' }"/> |
| | | </p:column> |
| | | |
| | | |
| | | <!--<p:column headerText="重量"> |
| | | <h:outputText value="#{row.remainder}"></h:outputText> |
| | | </p:column>--> |