product-inventory-management-after.git

			@@ -31,6 +31,9 @@
			<if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
			locked_quantity = locked_quantity + #{ew.lockedQuantity},
			</if>
			<if test="ew.warehouse != null and ew.warehouse !=''">
			warehouse = #{ew.warehouse},
			</if>
			update_time = now()
			</set>
			where product_model_id = #{ew.productModelId}
			@@ -65,6 +68,7 @@
			</update>
			<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
			select si.id,
			si.warehouse,
			si.qualitity,
			COALESCE(si.locked_quantity, 0) as locked_quantity,
			si.product_model_id,
			@@ -120,6 +124,7 @@
			unit,
			product_name,
			product_id,
			MAX(warehouse) as warehouse,
			'combined' as stockType
			from (
			select
			@@ -142,6 +147,7 @@
			pm.unit,
			p.product_name,
			p.id as product_id,
			si.warehouse,
			(
			select IFNULL(SUM(sor.stock_out_num), 0)
			from stock_out_record sor
			@@ -180,6 +186,7 @@
			pm.unit,
			p.product_name,
			p.id as product_id,
			su.warehouse,
			0 as qualifiedPendingOut,
			(
			select IFNULL(SUM(sor.stock_out_num), 0)
			@@ -221,7 +228,9 @@
			model,
			unit,
			product_name,
			product_id
			product_id,
			warehouse
			order by create_time desc
			</select>

			<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
			@@ -258,6 +267,7 @@
			unit,
			product_name,
			product_id,
			MAX(warehouse) as warehouse,
			'combined' as stockType
			from (
			select
			@@ -280,6 +290,7 @@
			pm.unit,
			p.product_name,
			p.id as product_id,
			si.warehouse,
			(
			select IFNULL(SUM(sor.stock_out_num), 0)
			from stock_out_record sor
			@@ -315,6 +326,7 @@
			pm.unit,
			p.product_name,
			p.id as product_id,
			su.warehouse,
			0 as qualifiedPendingOut,
			(
			select IFNULL(SUM(sor.stock_out_num), 0)
			@@ -341,7 +353,7 @@
			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 batch_no, product_model_id, model, unit, product_name, product_id, warehouse
			</select>
			<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
			select sir.*,si.qualitity as current_stock,
			@@ -367,6 +379,7 @@
			and sir.create_time <= #{ew.endMonth}
			</if>
			</where>
			order by sir.id desc
			</select>

			<select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">
			@@ -512,8 +525,9 @@
			and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
			order by si.product_model_id, si.batch_no
			</select>
			<select id="getByModelId" resultType="com.ruoyi.stock.pojo.StockInventory">
			select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
			<select id="getByModelId" resultType="com.ruoyi.stock.dto.StockInventoryDto">
			select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity,
			p.product_name, pm.model, pm.unit
			from stock_inventory si
			left join (
			select spd.stock_inventory_id, sum(spd.quantity) as qualitity
			@@ -530,6 +544,8 @@
			)
			group by spd.stock_inventory_id
			) as sd on sd.stock_inventory_id = si.id
			left join product_model pm on si.product_model_id = pm.id
			left join product p on pm.product_id = p.id
			where si.product_model_id = #{productModelId}
			and si.qualitity > IFNULL(sd.qualitity, 0)
			</select>
			@@ -557,6 +573,7 @@
			unit,
			product_name,
			product_id,
			MAX(warehouse) as warehouse,

			MAX(create_time) as create_time,
			MAX(update_time) as update_time,
			@@ -588,6 +605,7 @@
			COALESCE(si.warn_num, 0) as warn_num,
			si.version,
			si.remark,
			si.warehouse,

			(
			select IFNULL(SUM(sor.stock_out_num), 0)
			@@ -630,6 +648,7 @@
			0 as warn_num,
			su.version,
			su.remark,
			su.warehouse,

			0 as qualifiedPendingOut,

			@@ -663,7 +682,8 @@
			model,
			unit,
			product_name,
			product_id
			product_id,
			warehouse
			order by
			batch_no
			</select>