product-inventory-management-after.git

			@@ -8,6 +8,10 @@
			<result column="no" property="no" />
			<result column="return_type" property="returnType" />
			<result column="supplier_id" property="supplierId" />
			<result column="shipping_type" property="shippingType" />
			<result column="truck_plate_no" property="truckPlateNo" />
			<result column="express_company" property="expressCompany" />
			<result column="express_no" property="expressNo" />
			<result column="project_id" property="projectId" />
			<result column="project_phase" property="projectPhase" />
			<result column="prepared_at" property="preparedAt" />
			@@ -59,6 +63,10 @@
			pro.no returnNo,
			t.inboundBatches,
			sm.supplier_name,
			pro.shipping_type,
			pro.truck_plate_no,
			pro.express_company,
			pro.express_no,
			pro.prepared_at,
			pro.total_amount,
			CASE pro.return_type WHEN 0 THEN '退货退款' WHEN 1 THEN '拒收' END AS returnType,
			@@ -163,7 +171,7 @@
			prop.purchase_return_order_id,
			GREATEST(
			sir.stock_in_num
			- COALESCE(rs1.total_return_num1, 0)
			- COALESCE(rs.total_return_num, 0)
			- COALESCE(so.total_sale_out_num, 0),
			0
			) AS un_quantity,
			@@ -176,13 +184,8 @@
			LEFT JOIN (SELECT stock_in_record_id,
			SUM(return_quantity) AS total_return_num
			FROM purchase_return_order_products
			WHERE 1 = 1 and purchase_return_order_id = #{id}
			WHERE 1 = 1
			GROUP BY stock_in_record_id) rs ON rs.stock_in_record_id = sir.id
			LEFT JOIN (SELECT stock_in_record_id,
			SUM(return_quantity) AS total_return_num1
			FROM purchase_return_order_products
			WHERE 1 = 1 and purchase_return_order_id = #{id}
			GROUP BY stock_in_record_id) rs1 ON rs1.stock_in_record_id = sir.id
			LEFT JOIN (
			SELECT
			inv.batch_no,