ERP_override.git

			@@ -207,26 +207,36 @@

			<!-- 分架明细查询-->
			<select id="detailsSelectMp">
			select od.order_id,
			SELECT
			od.order_id,
			ogd.production_id,
			od.product_id,
			od.product_name,
			ROUND(SUM(DISTINCT od.quantity)-IFNULL(sum(fc.quantity)/fc.layers_number,0)) as quantity,
			SUM(od.compute_gross_area) as compute_gross_area,
			round(sum(od.perimeter), 2) as perimeter
			from sd.order_detail as od
			left join
			(select order_id, order_number,technology_number, production_id, splitting_status
			from sd.order_glass_detail
			GROUP BY order_id, order_number) as ogd
			on od.order_id = ogd.order_id and od.order_number = ogd.order_number
			left join flow_card as fc on fc.order_id = od.order_id and fc.order_number = od.order_number
			and fc.technology_number=ogd.technology_number
			where od.order_id = #{orderId}
			and ogd.splitting_status = 0
			ROUND(SUM(od.quantity) - IFNULL(SUM(fc.quantity) / fc.layers_number, 0)) AS quantity,
			SUM(od.compute_gross_area) AS compute_gross_area,
			ROUND(SUM(od.perimeter), 2) AS perimeter
			FROM sd.order_detail AS od
			LEFT JOIN (
			SELECT order_id, order_number, production_id, splitting_status,
			technology_number
			FROM sd.order_glass_detail
			GROUP BY order_id, order_number, production_id, splitting_status
			) AS ogd
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			LEFT JOIN (
			SELECT order_id, order_number, technology_number, SUM(quantity) AS quantity, layers_number
			FROM flow_card
			GROUP BY order_id, order_number, technology_number
			) AS fc
			ON fc.order_id = od.order_id
			AND fc.order_number = od.order_number
			AND fc.technology_number = ogd.technology_number
			WHERE od.order_id = #{orderId}
			AND ogd.splitting_status = 0
			GROUP BY od.order_id, ogd.production_id, od.product_id, od.product_name
			ORDER BY od.order_id DESC;

			group by od.order_id, ogd.production_id
			order by od.id desc
			</select>

			<!-- 更新分架状态-->