ERP_override.git

			@@ -106,11 +106,11 @@

			<!-- 流程卡进度-->
			<select id="processCardProgressMp">
			select
			a.product_name,
			select a.product_name,
			b.glass_child,
			d.order_type,
			concat(c.process_id,'/',c.technology_number) as process_id,
			c.order_number,
			c.technology_number,
			c.quantity,
			e.reportWorkQuantity,
			@@ -119,8 +119,7 @@
			ifnull(f.inventory,0) as inventory ,
			round(ifnull(f.inventory,0)*a.area,2) as inventoryArea,
			ifnull(dd.quantity,0) as shippedQuantity
			from
			flow_card as c
			from flow_card as c
			left join
			sd.order_detail as a
			on c.order_id = a.order_id
			@@ -134,8 +133,8 @@
			left join mm.finished_goods_inventory as f
			on c.order_id = f.order_id and f.order_number = c.order_number
			left join sd.delivery_detail as dd on dd.order_id=a.order_id and dd.order_number=a.order_number
			left join (
			SELECT process_id,
			left join (SELECT process_id,
			order_number,
			technology_number,
			sum(a.broken_num) as broken_num,
			concat('{',
			@@ -148,14 +147,15 @@
			) as reportWorkQuantityCount
			FROM sd.order_process_detail as a
			where a.order_id=#{orderId}
			GROUP BY process_id,a.technology_number
			) as e

			GROUP BY process_id, a.order_number, a.technology_number) as e
			on e.process_id = c.process_id
			and e.technology_number = c.technology_number

			and e.order_number = c.order_number
			where a.order_id = #{orderId}

			group by c.order_number,
			c.technology_number,
			c.process_id
			order by c.process_id, c.order_number, c.technology_number
			</select>

			<select id="getProcessBreaking" resultMap="damageDetailsTableMap">