耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材

李宇

2021-08-18 a1e90c3da21d88f994bac9c1feb91bf40e53a44d

 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml

@@ -118,19 +118,21 @@
    <update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
        update ope_warehouse_reserve
        <set>
        reagent_id=#{reagentId},
        reserve=#{reserve},
        update_time=now(),
        container_id=#{containerId},
        <if test="articleNumber != null and articleNumber !=''">
            article_number=#{articleNumber},
        </if>
        <if test="warehouseId != null and warehouseId !=''">
            warehouseId=#{warehouseId},
        </if>
        <if test="userId != null and userId !=''">
            user_id=#{userId},
        </if>
            reagent_id=#{reagentId},
            reserve=#{reserve},
            update_time=now(),
            <if test="articleNumber != null and articleNumber !=''">
                article_number=#{articleNumber},
            </if>
            <if test="warehouseId != null and warehouseId !=''">
                warehouseId=#{warehouseId},
            </if>
            <if test="containerId != null and containerId !=''">
                container_id=#{containerId},
            </if>
            <if test="userId != null and userId !=''">
                user_id=#{userId},
            </if>
        </set>
        where id=#{id}
    </update>
@@ -206,6 +208,21 @@

        order by oa.update_time,oa.reserve
    </select>
    <select id="countByReagentId" resultType="java.lang.Integer">
        select ifnull(sum(owr.reserve),0)
        from ope_warehouse_reserve as owr
        where owr.reserve > 0
        and owr.reagent_id = #{id}
        and owr.valid_flag = 1
        group by owr.reagent_id
    </select>
    <select id="getRowData" resultMap="OpeWarehouseReserve">

        <include refid="queryColumns"/>
        from ope_warehouse_reserve as oa
        <include refid="queryJoins"/>
        where oa.id = #{id}
    </select>

    <update id="updateByReId" parameterType="java.util.Map">
        update ope_warehouse_reserve set reagent_id=#{newReId} where reagent_id=#{oldReId}
@@ -214,6 +231,7 @@

    <update id="updateCount" parameterType="java.util.Map">
        update ope_warehouse_reserve set reserve=reserve+1 where reagent_id=#{reagentId} and article_number=#{articleNumber}
        and valid_flag = 1
    </update>
    <update id="updateBtReserve">
        UPDATE ope_warehouse_reserve