product-inventory-management-after.git

			@@ -99,96 +99,102 @@
			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,
			product_id,
			'combined' as stockType
			GROUP_CONCAT(DISTINCT batch_no ORDER BY batch_no SEPARATOR ',') as 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,
			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,
			COALESCE(si.warn_num, 0) as warn_num,
			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,
			(
			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
			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,
			COALESCE(si.warn_num, 0) as warn_num,
			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,
			(
			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

			union all
			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.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,
			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
			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.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,
			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
			) as combined
			<where>
			<if test="ew.productName != null and ew.productName !=''">
			@@ -196,14 +202,20 @@
			select distinct p.product_name
			from product p
			left join product_model pm on p.id = pm.product_id
			where p.product_name like concat('%',#{ew.productName},'%') or pm.model like concat('%',#{ew.productName},'%')
			where p.product_name like concat('%',#{ew.productName},'%')
			or pm.model like concat('%',#{ew.productName},'%')
			)
			</if>
			<if test="ew.topParentProductId != null and ew.topParentProductId > 0">
			and combined.product_id in (select id from product_tree)
			</if>
			</where>
			group by batch_no, product_model_id, model, unit, product_name, product_id
			group by
			product_model_id,
			model,
			unit,
			product_name,
			product_id
			</select>

			<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
			@@ -226,6 +238,7 @@
			model,
			unit,
			product_name,
			batch_no,
			MAX(warn_num) as warn_num,
			MAX(remark) as remark,
			MAX(update_time) as update_time
			@@ -238,6 +251,7 @@
			si.product_model_id,
			si.create_time,
			si.update_time,
			si.batch_no,
			COALESCE(si.warn_num, 0) as warn_num,
			si.remark,
			pm.model,
			@@ -259,6 +273,7 @@
			su.create_time,
			su.update_time,
			0 as warn_num,
			su.batch_no,
			su.remark,
			pm.model,
			pm.unit,
			@@ -281,7 +296,7 @@
			and combined.product_id in (select id from product_tree)
			</if>
			</where>
			group by product_model_id, model, unit, product_name
			group by product_model_id, model, unit, product_name,batch_no
			</select>
			<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
			select sir.*,si.qualitity as current_stock,
			@@ -471,6 +486,141 @@
			group by spd.stock_inventory_id
			) as sd on sd.stock_inventory_id = si.id
			where si.product_model_id = #{productModelId}
			and si.qualitity > IFNULL(sd.qualitity, 0)
			</select>

			<select id="getBatchNoQty" resultType="com.ruoyi.stock.dto.StockInventoryDto">
			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(IFNULL(qualifiedPendingOut, 0)) as qualifiedPendingOutQuantity,
			SUM(IFNULL(unQualifiedPendingOut, 0)) as unQualifiedPendingOutQuantity,

			SUM(qualifiedQuantity - qualifiedLockedQuantity - IFNULL(qualifiedPendingOut, 0)) as qualifiedUnLockedQuantity,
			SUM(unQualifiedQuantity - unQualifiedLockedQuantity - IFNULL(unQualifiedPendingOut, 0)) as unQualifiedUnLockedQuantity,

			product_model_id,
			model,
			unit,
			product_name,
			product_id,

			MAX(create_time) as create_time,
			MAX(update_time) as update_time,
			MAX(warn_num) as warn_num,
			MAX(version) as version,
			MAX(remark) as remark,

			'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 qualifiedLockedQuantity,
			0 as unQualifiedLockedQuantity,

			si.product_model_id,
			pm.model,
			pm.unit,
			p.product_name,
			p.id as product_id,

			si.create_time,
			si.update_time,
			COALESCE(si.warn_num, 0) as warn_num,
			si.version,
			si.remark,

			(
			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

			union all

			select
			su.batch_no,
			null as qualifiedId,
			su.id as unQualifiedId,

			0 as qualifiedQuantity,
			su.qualitity as unQualifiedQuantity,

			0 as qualifiedLockedQuantity,
			COALESCE(su.locked_quantity, 0) as unQualifiedLockedQuantity,

			su.product_model_id,
			pm.model,
			pm.unit,
			p.product_name,
			p.id as product_id,

			su.create_time,
			su.update_time,
			0 as warn_num,
			su.version,
			su.remark,

			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
			) as combined
			<where>
			<if test="ew.productModelId != null and ew.productModelId > 0">
			and combined.product_model_id = #{ew.productModelId}
			</if>

			<if test="ew.productId != null and ew.productId > 0">
			and combined.product_id = #{ew.productId}
			</if>
			</where>
			group by
			batch_no,
			product_model_id,
			model,
			unit,
			product_name,
			product_id
			order by
			batch_no
			</select>

			</mapper>