ERP_override.git

			@@ -63,6 +63,7 @@
			sum(c.compute_gross_area) as compute_gross_area,
			a.founder,
			c.processing_note,
			b.customer_name,
			if(a.layout_status=0,'不可排版',if(a.layout_status=1,'可排版','已排版')) as layout_status
			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
			@@ -93,7 +94,9 @@
			<if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '已排版'">
			and a.layout_status regexp 2
			</if>

			<if test="flowCard.order.customerName != null and flowCard.order.customerName!= ''">
			and b.customer_name regexp #{flowCard.order.customerName}
			</if>
			group by a.process_Id
			ORDER BY a.id desc
			limit #{offset},#{pageSize};
			@@ -507,7 +510,8 @@
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			concat(od.processing_note,od.remarks) as remarks
			concat(od.processing_note,od.remarks) as remarks,
			od.other_columns
			from flow_card as fc
			left join sd.order_glass_detail as ogd
			on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
			@@ -551,6 +555,7 @@
			od.width,
			od.height,
			ogd.glass_child,
			ogd.process,
			e.type_name,
			opd.stock_id,
			od.quantity,
			@@ -560,7 +565,7 @@
			left join sd.order_detail od
			on SUBSTR(opd.process_id, 1, 10) = od.order_id and opd.order_sort = od.order_number
			left join sd.order_glass_detail ogd
			on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number
			on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number and opd.layer=ogd.technology_number
			left join sd.product p on od.product_id = p.id
			left join sd.basic_glass_type e on e.type_id = p.type_id
			where opd.project_no = #{projectNo}
			@@ -577,10 +582,12 @@
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			ogd.glass_child,
			ogd.process,
			c.customer_abbreviation as customer_name,
			ifnull(od.processing_note,'') as processing_note,
			bgt.type_name,
			od.other_columns
			od.other_columns,
			od.building_number
			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