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

liyong

2 天以前 4635770544e2d57416ad88a8983ee293919f5fec

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

@@ -506,7 +506,7 @@
        where si.product_model_id in
        <foreach collection="productModelIds" item="productModelId" open="(" separator="," close=")">
            #{productModelId}
        </foreach>c
        </foreach>
          and si.batch_no is not null
          and si.batch_no != ''
          and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0