product-inventory-management-after.git

			@@ -12,6 +12,9 @@
			<result column="version" property="version"/>
			<result column="locked_quantity" property="lockedQuantity"/>
			<result column="warn_num" property="warnNum"/>
			<result column="process_category" property="processCategory"/>
			<result column="voltage" property="voltage"/>
			<result column="batch_no" property="batchNo"/>
			</resultMap>
			<update id="updateAddStockInventory">
			update stock_inventory
			@@ -64,6 +67,8 @@
			(si.qualitity - COALESCE(si.locked_quantity, 0)) AS un_locked_quantity,
			pm.model,
			si.remark,
			si.process_category as processCategory,
			si.voltage,
			pm.unit,
			pm.material_code as materialCode,
			p.product_name,
			@@ -78,6 +83,12 @@
			AND (p2.product_name != '半成品' OR p2.product_name IS NULL)
			<if test="ew.productName != null and ew.productName != ''">
			AND p.product_name 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>
			</select>

			@@ -109,6 +120,8 @@
			MAX(version) as version,
			model,
			MAX(remark) as remark,
			processCategory,
			voltage,
			unit,
			product_name,
			product_id,
			@@ -133,6 +146,8 @@
			(si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
			pm.model,
			si.remark,
			si.process_category as processCategory,
			si.voltage as voltage,
			pm.unit,
			p.product_name,
			p.id as product_id,
			@@ -161,6 +176,8 @@
			(su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
			pm.model,
			su.remark,
			'' as processCategory,
			'' as voltage,
			pm.unit,
			p.product_name,
			p.id as product_id,
			@@ -184,7 +201,7 @@
			and combined.product_id in (select id from product_tree)
			</if>
			</where>
			group by product_model_id, model, unit, product_name, product_id, qualifiedBatchNo, unQualifiedBatchNo, materialCode, product_id, qualifiedBatchNo, unQualifiedBatchNo
			group by product_model_id, model, unit, product_name, product_id, unQualifiedBatchNo, materialCode, processCategory, voltage
			</select>

			<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
			@@ -207,6 +224,8 @@
			model,
			unit,
			product_name,
			processCategory,
			voltage,
			MAX(warn_num) as warn_num,
			MAX(remark) as remark,
			MAX(update_time) as update_time,
			@@ -227,6 +246,8 @@
			pm.model,
			pm.unit,
			p.product_name,
			si.process_category as processCategory,
			si.voltage as voltage,
			p.id as product_id,
			si.batch_no as qualifiedBatchNo,
			null as unQualifiedBatchNo,
			@@ -250,6 +271,8 @@
			pm.model,
			pm.unit,
			p.product_name,
			'' as processCategory,
			'' as voltage,
			p.id as product_id,
			null as qualifiedBatchNo,
			su.batch_no as unQualifiedBatchNo,
			@@ -271,18 +294,32 @@
			and combined.product_id in (select id from product_tree)
			</if>
			</where>
			group by product_model_id, model, unit, product_name, qualifiedBatchNo, unQualifiedBatchNo, materialCode
			group by product_model_id, model, unit, product_name, unQualifiedBatchNo, materialCode, processCategory, voltage
			</select>
			<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
			select sir.*,si.qualitity as current_stock,
			pm.model,
			sir.process_category as processCategory,
			sir.voltage,
			pm.unit,
			pm.material_code as materialCode,
			p.product_name,
			su.nick_name as create_by
			from
			stock_in_record sir
			left join stock_inventory si on sir.product_model_id = si.product_model_id
			left join stock_inventory si
			on sir.product_model_id = si.product_model_id
			and (
			(ifnull(sir.process_category, '') != '' or ifnull(sir.voltage, '') != '')
			and ifnull(sir.process_category, '') = ifnull(si.process_category, '')
			and ifnull(sir.voltage, '') = ifnull(si.voltage, '')
			or
			ifnull(sir.process_category, '') = ''
			and ifnull(sir.voltage, '') = ''
			and ifnull(si.process_category, '') = ''
			and ifnull(si.voltage, '') = ''
			and si.product_model_id = sir.product_model_id
			)
			left join product_model pm on sir.product_model_id = pm.id
			left join product p on pm.product_id = p.id
			left join sys_user su on sir.create_user = su.user_id
			@@ -432,6 +469,8 @@
			(si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
			pm.model,
			si.remark,
			si.process_category as processCategory,
			si.voltage,
			pm.unit,
			p.product_name,
			p.id as product_id
			@@ -440,4 +479,35 @@
			left join product p on pm.product_id = p.id
			</select>

			</mapper>
			<select id="selectFinishedProductInventoryList" resultType="com.ruoyi.stock.dto.StockInventoryDto">
			select si.id,
			si.product_model_id,
			si.process_category as processCategory,
			si.voltage,
			pm.model,
			pm.material_code as materialCode,
			pm.unit,
			p.product_name,
			p.id as product_id
			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
			left 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>