Merge remote-tracking branch 'origin/master'

cuilei

4 天以前 af0f58e4b39a363b73587fa1b4cce7be46e203f5

 src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml

@@ -13,7 +13,11 @@
      <foreach collection="materialNumberList" item="item" separator="," open="(" close=")">
         #{item}
      </foreach>
        <if test="heatFlag != null and heatFlag != ''">
            AND t2.heat_treatment_flag = #{heatFlag}
        </if>
      AND t2.warehouse_id = #{factoryId}
      AND t2.inventory_status = 'NORMAL'
      AND t1.del_flag = 0
      GROUP BY
         t1.material_number,
@@ -29,4 +33,19 @@
        left join base_line_side_warehouse m2 on m1.warehouse_id = m2.id

    </select>
   <select id="queryMaterialInventory" resultType="org.jeecg.modules.lsw.vo.MaterialInventoryVO">
        select t2.material_number,
        t2.material_name,
        t2.material_category,
        t1.batch_number,
        t1.quantity
        from lsw_material_inventory t1
        left join lsw_material t2 on t1.material_id = t2.id
        where t1.inventory_status = 'NORMAL'
        and t1.warehouse_id = #{warehouseId}
        and t2.material_category in
        <foreach collection="materialCategoryList" item="item" separator="," open="(" close=")">
            #{item}
        </foreach>
    </select>
</mapper>