Merge remote-tracking branch 'origin/master'

zss

2023-08-15 d9e5ab959b7ff2c578672938c205a7a82765ef9f

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

@@ -14,7 +14,7 @@
        <where>
            and state=1
            <if test="name!=null and name!=''">
                and name LIKE  CONCAT('%',#{name},'%')
                and name LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="specifications!=null and specifications!=''">
                and specifications LIKE CONCAT('%',#{specifications},'%')
@@ -28,6 +28,13 @@
            <if test="checkState!=null and checkState!=''">
                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
    </select>
</mapper>