product-inventory-management-after.git

			@@ -19,9 +19,13 @@
			<if test="ew.qualitity != null">
			qualitity = qualitity + #{ew.qualitity},
			</if>
			<if test="ew.netWeight != null">
			net_weight = net_weight + #{ew.netWeight},
			</if>
			<if test="ew.version != null">
			version = version + 1,
			</if>

			<if test="ew.remark != null and ew.remark !=''">
			remark = #{ew.remark},
			</if>
			@@ -41,6 +45,9 @@
			<if test="ew.qualitity != null">
			qualitity = qualitity - #{ew.qualitity},
			</if>
			<if test="ew.netWeight != null">
			net_weight = net_weight - #{ew.netWeight},
			</if>
			<if test="ew.version != null">
			version = version + 1,
			</if>
			@@ -53,6 +60,7 @@
			</update>
			<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
			select si.id,
			si.net_weight,
			si.qualitity,
			COALESCE(si.locked_quantity, 0) as locked_quantity,
			si.product_model_id,
			@@ -64,14 +72,22 @@
			pm.model,
			si.remark,
			pm.unit,
			p.product_name
			p.product_name,
			p1.product_name as parent_name,
			p1.id as parent_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
			where 1 = 1
			<if test="ew.productName != null and ew.productName !=''">
			and p.product_name like concat('%',#{ew.productName},'%')
			</if>
			left join product p1 on p.parent_id = p1.id
			<where>
			1=1
			<if test="ew.parentId != null and ew.parentId !=''">
			and p.parent_id = #{ew.parentId}
			</if>
			<if test="ew.productName != null and ew.productName !=''">
			and p.product_name like concat('%',#{ew.productName},'%')
			</if>
			</where>
			</select>
			<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
			select si.qualitity,