product-inventory-management-after.git

			@@ -231,33 +231,58 @@
			INNER JOIN product_tree pt ON p.parent_id = pt.id
			)
			select
			batch_no,
			MAX(qualifiedId) as qualifiedId,
			MAX(unQualifiedId) as unQualifiedId,
			SUM(qualifiedQuantity) as qualifiedQuantity,
			SUM(unQualifiedQuantity) as unQualifiedQuantity,
			SUM(qualifiedLockedQuantity) as qualifiedLockedQuantity,
			SUM(unQualifiedLockedQuantity) as unQualifiedLockedQuantity,
			SUM(qualifiedQuantity - qualifiedLockedQuantity - IFNULL(qualifiedPendingOut, 0)) as qualifiedUnLockedQuantity,
			SUM(unQualifiedQuantity - unQualifiedLockedQuantity - IFNULL(unQualifiedPendingOut, 0)) as unQualifiedUnLockedQuantity,
			SUM(IFNULL(qualifiedPendingOut, 0)) as qualifiedPendingOutQuantity,
			SUM(IFNULL(unQualifiedPendingOut, 0)) as unQualifiedPendingOutQuantity,
			product_model_id,
			MAX(create_time) as create_time,
			MAX(update_time) as update_time,
			MAX(warn_num) as warn_num,
			MAX(version) as version,
			model,
			MAX(remark) as remark,
			unit,
			product_name,
			batch_no,
			MAX(warn_num) as warn_num,
			MAX(remark) as remark,
			MAX(update_time) as update_time
			product_id,
			'combined' as stockType
			from (
			select
			si.batch_no,
			si.id as qualifiedId,
			null as unQualifiedId,
			si.qualitity as qualifiedQuantity,
			0 as unQualifiedQuantity,
			COALESCE(si.locked_quantity, 0) as locked_quantity,
			COALESCE(si.locked_quantity, 0) as qualifiedLockedQuantity,
			0 as unQualifiedLockedQuantity,
			si.product_model_id,
			si.create_time,
			si.update_time,
			si.batch_no,
			COALESCE(si.warn_num, 0) as warn_num,
			si.remark,
			si.version,
			(si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
			pm.model,
			si.remark,
			pm.unit,
			p.product_name,
			p.id as product_id
			p.id as product_id,
			(
			select IFNULL(SUM(sor.stock_out_num), 0)
			from stock_out_record sor
			where sor.product_model_id = si.product_model_id
			and (si.batch_no is null and sor.batch_no is null or si.batch_no = sor.batch_no)
			and sor.type = '0'
			and sor.approval_status = 0
			) as qualifiedPendingOut,
			0 as unqualifiedPendingOut
			from stock_inventory si
			left join product_model pm on si.product_model_id = pm.id
			left join product p on pm.product_id = p.id
			@@ -265,20 +290,34 @@
			union all

			select
			su.batch_no,
			null as qualifiedId,
			su.id as unQualifiedId,
			0 as qualifiedQuantity,
			su.qualitity as unQualifiedQuantity,
			COALESCE(su.locked_quantity, 0) as locked_quantity,
			0 as qualifiedLockedQuantity,
			COALESCE(su.locked_quantity, 0) as unQualifiedLockedQuantity,
			su.product_model_id,
			su.create_time,
			su.update_time,
			0 as warn_num,
			su.batch_no,
			su.remark,
			su.version,
			(su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
			pm.model,
			su.remark,
			pm.unit,
			p.product_name,
			p.id as product_id
			p.id as product_id,
			0 as qualifiedPendingOut,
			(
			select IFNULL(SUM(sor.stock_out_num), 0)
			from stock_out_record sor
			where sor.product_model_id = su.product_model_id
			and (su.batch_no is null and sor.batch_no is null or su.batch_no = sor.batch_no)
			and sor.type = '1'
			and sor.approval_status = 0
			) as unqualifiedPendingOut
			from stock_uninventory su
			left join product_model pm on su.product_model_id = pm.id
			left join product p on pm.product_id = p.id
			@@ -296,7 +335,7 @@
			and combined.product_id in (select id from product_tree)
			</if>
			</where>
			group by product_model_id, model, unit, product_name,batch_no
			group by batch_no, product_model_id, model, unit, product_name, product_id
			</select>
			<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
			select sir.*,si.qualitity as current_stock,