Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-24 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035

 inventory-server/src/main/resources/mapper/RepertoryMapper.xml

@@ -5,10 +5,10 @@
        select id,
        name,
        specifications,
        code,
        check_state,
        quality_traceability,
        user_name,
        DATE_FORMAT(create_time, '%Y-%m-%d') '入库日期',
        check_result,
        note
        from mom_ocean.repertory
        <where>
@@ -25,18 +25,7 @@
            <if test="type!=null ">
                and type=#{type}
            </if>
            <if test="checkState!=null ">
                and check_state=#{checkState}
            </if>
            order by id desc
        </where>
    </select>
    <!--查询库存三个字段给添加销售单-->
    <select id="getSale" resultType="java.util.Map">
        select id, name, specifications, unit
        from mom_ocean.repertory
        where state = 1
          and check_state = 1
          and type = 0
    </select>
</mapper>