Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

buhuazhen

8 天以前 c449e0d7e5e537cd8dfb5928572db31d0310bc0e

 src/main/resources/mapper/stock/StockUninventoryMapper.xml

@@ -95,4 +95,13 @@
        </if>
    </select>

    <select id="selectPendingOutQuantity" resultType="java.math.BigDecimal">
        SELECT IFNULL(SUM(sor.stock_out_num), 0)
        FROM stock_out_record sor
        WHERE sor.product_model_id = #{productModelId}
          AND (sor.batch_no = #{batchNo} OR (#{batchNo} IS NULL AND sor.batch_no IS NULL))
          AND sor.type = #{type}
          AND sor.approval_status = 0
    </select>

</mapper>