ERP_override.git

			@@ -218,7 +218,6 @@
			on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number
			set ogd.splitting_status=0
			where ogd.order_id = #{orderId}
			and ogd.production_id = left(#{processId}, 11)

			</update>

			@@ -226,7 +225,7 @@
			<update id="deleteFlowCardMp">
			delete
			from flow_card as fc
			where fc.production_id = left(#{processId}, 11)
			where fc.order_id = left(#{processId}, 10)
			</update>

			<!-- 分架新增明细查询-->
			@@ -447,7 +446,7 @@
			<delete id="deleteReportingWork">
			delete
			from sd.order_process_detail
			where left(process_id, 11) = left(#{processId}, 11)
			where order_id = left(#{processId}, 10)
			</delete>

			<select id="selectPrintFlowCardMp">
			@@ -587,14 +586,15 @@
			o.project,
			od.building_number,
			od.processing_note,
			od.width,
			od.height,
			ogd.child_width as width,
			ogd.child_height as height,
			ogd.glass_child,
			ogd.process,
			e.type_name,
			opd.stock_id,
			od.quantity,
			od.other_columns
			od.other_columns,
			od.bend_radius
			from pp.optimize_detail opd
			left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
			left join sd.order_detail od
			@@ -612,8 +612,8 @@
			select o.order_id ,
			o.project,
			o.customer_id ,
			od.width,
			od.height,
			ogd.child_width as width,
			ogd.child_height as height,
			od.quantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			@@ -623,7 +623,8 @@
			ifnull(od.processing_note,'') as processing_note,
			bgt.type_name,
			od.other_columns,
			od.building_number
			od.building_number,
			od.bend_radius
			from sd.order as o
			left join sd.order_detail as od on o.order_id = od.order_id
			left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number