ERP_override.git

			@@ -116,8 +116,9 @@
			e.reportWorkQuantity,
			e.reportWorkQuantityCount,
			e.broken_num,
			round(ifnull(f.inventory,0)*a.area,2) as inventoryArea

			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
			left join
			@@ -132,6 +133,7 @@
			on c.order_id = d.order_id
			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,
			technology_number,
			@@ -148,6 +150,7 @@
			where a.order_id=#{orderId}
			GROUP BY process_id,a.technology_number
			) as e

			on e.process_id = c.process_id
			and e.technology_number = c.technology_number

			@@ -497,13 +500,13 @@

			<select id="splittingDetailsOutsideMp">
			SELECT
			fc.process_id,
			fc.order_number,
			fc.technology_number,
			fc.process_id processId,
			fc.order_number orderNumber,
			fc.technology_number as technologyNumber,
			o.project,
			o.batch,
			ogd.child_width,
			ogd.child_height,
			ogd.child_width as childWidth,
			ogd.child_height as childHeight,
			fc.quantity,
			round( ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2 ) as area,
			od.shape,
			@@ -601,12 +604,12 @@
			c.quantity,
			c.technology_number,
			b.glass_child,
			e.reportWorkQuantity,
			e.reportWorkQuantityCount,
			ifnull(e.reportWorkQuantity,0) as reportWorkQuantity,
			ifnull(e.reportWorkQuantityCount,0) as reportWorkQuantityCount,
			ifnull(f.inventory,0) as inventoryNum,
			round(ifnull(f.inventory,0)*a.area,2) as inventoryArea,
			dd.quantity as shippedQuantity,
			dd.area
			ifnull(dd.quantity,0) as shippedQuantity,
			ifnull(dd.area,0) as area

			from
			flow_card as c
			@@ -646,10 +649,10 @@
			</select>

			<select id="taskCompletionStatusMp">
			select d.customer_name,
			select d.customer_name as customerName,
			d.project,
			d.batch,
			c.order_id,
			c.order_id as orderId,
			d.quantity,
			d.area,
			dd.quantity as shippedQuantity,
			@@ -1007,4 +1010,5 @@
			group by fc.process_id, fc.order_number, fc.technology_number
			order by fc.process_id, fc.order_number, fc.technology_number
			</select>

			</mapper>