product-inventory-management-after.git

			@@ -22,7 +22,8 @@
			SELECT
			pro.*,
			sm.supplier_name as supplier_name,
			pl.purchase_contract_number as purchase_contract_number
			pl.purchase_contract_number as purchase_contract_number,
			pl.master_contract_no as master_contract_no
			FROM purchase_return_orders pro
			LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
			LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
			@@ -54,7 +55,7 @@
			where pro.id = #{id}
			</select>
			<select id="listPageAccountPurchaseReturn"
			resultType="com.ruoyi.account.bean.vo.PurchaseReturnVo">
			resultType="com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo">
			select pro.id,
			pro.no returnNo,
			t.inboundBatches,
			@@ -62,7 +63,8 @@
			pro.prepared_at,
			pro.total_amount,
			CASE pro.return_type WHEN 0 THEN '退货退款' WHEN 1 THEN '拒收' END AS returnType,
			pl.purchase_contract_number
			pl.purchase_contract_number,
			pl.master_contract_no
			from purchase_return_orders pro
			left join
			(select prop.purchase_return_order_id,
			@@ -76,6 +78,9 @@
			<if test="req.returnNo != null and req.returnNo != ''">
			and pro.no like concat('%',#{req.returnNo},'%')
			</if>
			<if test="req.supplierId != null">
			and pro.supplier_id = #{req.supplierId}
			</if>
			<if test="req.supplierName != null and req.supplierName != ''">
			and sm.supplier_name like concat('%',#{req.supplierName},'%')
			</if>