product-inventory-management-after.git

			@@ -28,7 +28,11 @@
			GROUP_CONCAT(sour.outbound_batches SEPARATOR ',') AS outboundBatches
			from account_sales_collection ascc
			left join customer c on ascc.customer_id = c.id
			<!-- 手工发货单出库按 stock_out_record_ids 找，油品出库按绑定行 stock_out_binding_ids 反查所在的出库单 -->
			left join stock_out_record sour on FIND_IN_SET(sour.id, ascc.stock_out_record_ids) > 0
			OR EXISTS (select 1 from stock_out_record_sales_ledger b
			where b.stock_out_record_id = sour.id
			and FIND_IN_SET(b.id, ascc.stock_out_binding_ids) > 0)
			GROUP BY ascc.id)A
			left join account_statement_details asd on A.collection_number = asd.receipt_number
			<where>
			@@ -55,6 +59,12 @@
			FIND_IN_SET(#{id}, stock_out_record_ids)
			</foreach>
			</select>
			<!-- 可收款的销售出库候选。
			① record_type='13' 的手工发货单出库 → b.id 为 NULL，已收款额按 stock_out_record_ids 汇总；
			② 油品出库（type 为空）按「出库单×客户」拆到绑定行 → 已收款额按 stock_out_binding_ids 汇总，
			金额只算该客户分摊的那部分。两个 id 空间不能混比，故按 b.id 是否为空分开。
			已收款额改成标量子查询：原来用 LEFT JOIN + GROUP BY outbound_batches 聚合，且条件写成
			acsc.stock_out_record_ids = sor.id（等值比逗号串），一个出库单收过款后面的就再也匹配不上。 -->
			<select id="getOutboundBatchesByCustomer"
			resultType="com.ruoyi.account.bean.vo.sales.SalesOutboundVo">
			SELECT
			@@ -74,36 +84,58 @@
			SELECT
			sor.id,
			sor.outbound_batches,
			sl.customer_name,
			IFNULL(b.customer_name, sl.customer_name) AS customer_name,
			sor.create_time AS shipping_date,
			p.product_name,
			pm.model AS specification_model,
			slp.tax_rate,
			sor.stock_out_num * slp.tax_inclusive_unit_price AS outbound_amount,
			IFNULL(pb.product_name, p.product_name) AS product_name,
			IFNULL(pmb.model, pm.model) AS specification_model,
			IFNULL(slpb.tax_rate, slp.tax_rate) AS tax_rate,
			CASE
			WHEN b.id IS NOT NULL THEN b.quantity * slpb.tax_inclusive_unit_price
			ELSE sor.stock_out_num * slp.tax_inclusive_unit_price
			END AS outbound_amount,
			s.shipping_no,
			sl.sales_contract_no,
			COALESCE ( SUM( acsc.collection_amount ), 0 ) AS amount_received
			IFNULL(slb.sales_contract_no, sl.sales_contract_no) AS sales_contract_no,
			(SELECT COALESCE(SUM(acsc.collection_amount), 0)
			FROM account_sales_collection acsc
			WHERE (b.id IS NULL AND FIND_IN_SET(sor.id, acsc.stock_out_record_ids) > 0)
			OR (b.id IS NOT NULL AND FIND_IN_SET(b.id, acsc.stock_out_binding_ids) > 0)
			) AS amount_received
			FROM
			stock_out_record sor
			LEFT JOIN stock_out_record_sales_ledger b ON b.stock_out_record_id = sor.id
			LEFT JOIN shipping_info s ON sor.record_id = s.id
			LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
			LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
			AND slp.type = 1
			LEFT JOIN sales_ledger slb ON slb.id = b.sales_ledger_id
			LEFT JOIN sales_ledger_product slpb ON slpb.id = b.sales_ledger_product_id
			AND slpb.type = 1
			LEFT JOIN product_model pm ON slp.product_model_id = pm.id
			LEFT JOIN product p ON pm.product_id = p.id
			LEFT JOIN account_sales_collection acsc ON acsc.stock_out_record_ids = sor.id
			LEFT JOIN product_model pmb ON sor.product_model_id = pmb.id
			LEFT JOIN product pb ON pmb.product_id = pb.id
			WHERE
			sor.record_type = '13'
			AND sor.approval_status = 1
			AND sl.customer_id = #{customerId}
			GROUP BY
			sor.outbound_batches
			sor.approval_status = 1
			AND (
			sor.record_type = '13'
			OR (b.id IS NOT NULL AND (sor.type IS NULL OR sor.type = ''))
			)
			AND IFNULL(b.customer_id, sl.customer_id) = #{customerId}
			ORDER BY
			sor.id
			sor.id, IFNULL(b.id, 0)
			) tempA
			WHERE
			amount_received < outbound_amount
			</select>
			<!-- 油品出库的绑定行与出库单是两个独立 id 空间，判重要分开查 -->
			<select id="existsByStockOutBindingId" resultType="java.lang.Boolean">
			SELECT COUNT(*) > 0
			FROM account_sales_collection
			WHERE
			<foreach collection="stockOutBindingIds" item="id" open="(" separator=" OR " close=")">
			FIND_IN_SET(#{id}, stock_out_binding_ids)
			</foreach>
			</select>
			<select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
			SELECT DATE_FORMAT(collection_date, #{dateFormat}) AS dateStr,
			IFNULL(SUM(collection_amount), 0) AS amount