ERP_override.git

			@@ -62,7 +62,7 @@
			a.founder,
			c.processing_note,
			if(a.layout_status=0,"不可排版",if(a.layout_status=1,"可排版","已排版")) as layout_status
			from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
			from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time from flow_card group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id
			left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
			where a.create_time between #{selectTime1} and #{selectTime2}
			<if test="flowCard.orderId != null and flowCard.orderId != ''">
			@@ -211,7 +211,7 @@
			<update id="deleteFlowCardMp">
			delete
			from flow_card as fc
			where fc.process_id = #{processId}
			where fc.production_id = left(#{processId},11)
			</update>

			<!-- 分架新增明细查询-->
			@@ -390,9 +390,11 @@
			select fc.order_id,
			fc.process_id,
			fc.order_number,
			fc.technology_number,
			fc.quantity,
			round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
			od.product_name,
			ogd.glass_child,
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time
			from flow_card as fc
			@@ -401,6 +403,12 @@
			fc.technology_number = ogd.technology_number
			left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
			where fc.process_id = #{processId}
			GROUP BY fc.order_id, fc.process_id, fc.order_number
			GROUP BY fc.order_id, fc.process_id, fc.order_number,fc.technology_number
			order by fc.order_number,fc.technology_number
			</select>

			<delete id="deleteReportingWork">
			delete from sd.order_process_detail
			where left(process_id,11) = left(#{processId},11)
			</delete>
			</mapper>