product-inventory-management-after.git

			@@ -90,6 +90,7 @@
			<if test="ew.voltage != null and ew.voltage != ''">
			AND si.voltage = #{ew.voltage}
			</if>
			order by si.create_time desc
			</select>

			<select id="pageListCombinedStockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
			@@ -510,4 +511,36 @@
			order by p.id asc, pm.id asc, si.id asc
			</select>

			<select id="selectFinishedProductList" resultType="com.ruoyi.stock.dto.FinishedProductTreeDto">
			select si.id as stockId,
			p.id as productId,
			p.product_name as productName,
			p.product_name as label,
			pm.id as productModelId,
			pm.model,
			si.process_category as processCategory,
			si.voltage,
			pm.material_code as materialCode,
			pm.unit
			from stock_inventory si
			inner join product_model pm on si.product_model_id = pm.id
			inner join product p on pm.product_id = p.id
			inner join product pp on p.parent_id = pp.id
			<where>
			pp.product_name = '成品'
			<if test="ew.productName != null and ew.productName != ''">
			and (p.product_name like concat('%', #{ew.productName}, '%')
			or pm.model like concat('%', #{ew.productName}, '%')
			or pm.material_code like concat('%', #{ew.productName}, '%'))
			</if>
			<if test="ew.processCategory != null and ew.processCategory != ''">
			and si.process_category = #{ew.processCategory}
			</if>
			<if test="ew.voltage != null and ew.voltage != ''">
			and si.voltage = #{ew.voltage}
			</if>
			</where>
			order by p.id asc, pm.id asc, si.id asc
			</select>

			</mapper>