product-inventory-management-after.git

			@@ -209,6 +209,12 @@
			<if test="ew.topParentProductId != null and ew.topParentProductId > 0">
			and combined.product_id in (select id from product_tree)
			</if>
			<if test="ew.model != null and ew.model !=''">
			and combined.model like concat('%',#{ew.model},'%')
			</if>
			<if test="ew.batchNo != null and ew.batchNo !=''">
			and combined.batch_no like concat('%',#{ew.batchNo},'%')
			</if>
			</where>
			group by
			product_model_id,
			@@ -500,14 +506,15 @@
			where si.product_model_id in
			<foreach collection="productModelIds" item="productModelId" open="(" separator="," close=")">
			#{productModelId}
			</foreach>
			</foreach>c
			and si.batch_no is not null
			and si.batch_no != ''
			and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
			order by si.product_model_id, si.batch_no
			</select>
			<select id="getByModelId" resultType="com.ruoyi.stock.pojo.StockInventory">
			select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
			<select id="getByModelId" resultType="com.ruoyi.stock.dto.StockInventoryDto">
			select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity,
			p.product_name, pm.model, pm.unit
			from stock_inventory si
			left join (
			select spd.stock_inventory_id, sum(spd.quantity) as qualitity
			@@ -524,6 +531,8 @@
			)
			group by spd.stock_inventory_id
			) as sd on sd.stock_inventory_id = si.id
			left join product_model pm on si.product_model_id = pm.id
			left join product p on pm.product_id = p.id
			where si.product_model_id = #{productModelId}
			and si.qualitity > IFNULL(sd.qualitity, 0)
			</select>