ERP_override.git

			@@ -65,9 +65,9 @@
			a.founder,
			c.processing_note,
			b.customer_name,
			if(MAX(a.layout_status)=0,'不可排版',if(MAX(a.layout_status)=1,'可排版','已排版')) as layout_status,
			if(a.layout_status=0,'不可排版',if(a.layout_status=1,'可排版','已排版')) as layout_status,
			a.merge
			from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time,merge from flow_card
			from (select id,order_id,process_id,order_number, quantity,founder,max(layout_status) as layout_status,create_time,merge 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 date(a.create_time)>=#{selectTime1} and date(a.create_time) <= #{selectTime2}
			@@ -263,7 +263,8 @@
			ods.S02,
			ods.S03,
			ods.S04,
			ods.S05
			ods.S05,
			od.building_number
			from sd.order_detail as od
			left join sd.order_glass_detail as ogd
			on od.order_id = ogd.order_id and od.order_number = ogd.order_number
			@@ -477,7 +478,7 @@
			</select>

			<select id="selectPrintFlowCard">
			select *
			select project_no,glass_total,glass_total_area
			from pp.optimize_project
			where date(create_time)>=#{selectTime1} and date(create_time) <= #{selectTime2}
			and state >= 20
			@@ -516,13 +517,14 @@
			ogds.glass_child AS concatenated_glass_child,
			process AS processed_part,
			ogds.child_width,
			ogds.child_height
			ogds.child_height,
			ogds.group
			from sd.order_glass_detail as ogds
			where ogds.order_id = #{orderId}
			GROUP BY order_id, order_number, ogds.glass_child, process) as ogdss
			GROUP BY order_id, order_number, ogds.glass_child, process,ogds.group) as ogdss
			on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
			where fc.order_id = #{orderId}
			GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part
			GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part,ogdss.group
			order by fc.process_id, ogdss.technology_number)

			UNION
			@@ -664,7 +666,9 @@
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			pd.separation,
			fc.technology_number
			fc.technology_number,
			IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
			od.building_number
			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
			@@ -1213,7 +1217,9 @@
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			pd.separation,
			fc.technology_number
			fc.technology_number,
			IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
			od.building_number
			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
			@@ -2014,6 +2020,7 @@
			/ogd.technology_number,/
			ogd.glass_address,
			(fc.quantity) as quantity,
			(fc.quantity) as printQuantity,
			round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
			od.product_name,
			ogd.glass_child,
			@@ -2044,6 +2051,7 @@
			ogd.technology_number,
			ogd.glass_address,
			(fc.quantity) as quantity,
			(fc.quantity) as printQuantity,
			round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
			od.product_name,
			ogd.glass_child,
			@@ -2085,7 +2093,7 @@
			od.processing_note as processingNote,
			width,
			height,
			fc.quantity,
			#{printQuantity} as quantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -2154,7 +2162,7 @@
			od.processing_note as processingNote,
			od.width,
			od.height,
			fc.quantity,
			fc.quantity as flowQuantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -2181,7 +2189,8 @@
			'文本' as custom2,
			'文本' as custom3,
			'文本' as custom4,
			'文本' as custom5
			'文本' as custom5,
			od.quantity
			from optimize_detail as opt
			left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
			left join sd.order as o on o.order_id=fc.order_id
			@@ -2301,7 +2310,7 @@
			od.processing_note as processingNote,
			od.width,
			od.height,
			fc.quantity,
			fc.quantity as flowQuantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -2328,7 +2337,8 @@
			'文本' as custom2,
			'文本' as custom3,
			'文本' as custom4,
			'文本' as custom5
			'文本' as custom5,
			od.quantity
			from optimize_detail as opt
			left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
			left join sd.order as o on o.order_id=fc.order_id
			@@ -2341,4 +2351,84 @@
			order by opt.stock_id,opt.polys_id
			</select>

			<select id="getPrintCustomDataProject">
			select
			o.order_id as orderId,
			project,
			customer_id as customerId,
			o.customer_name as customerName,
			order_type as orderType,
			order_classify as orderClassify,
			batch,
			o.icon,
			pack_type as packType,
			delivery_date as deliveryDate,
			al_type as alType,
			money,
			contract_id as contractId,
			customer_batch customerBatch,
			contacts,
			delivery_address as deliveryAddress,
			od.processing_note as processingNote,
			od.width,
			od.height,
			fc.quantity as flowQuantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			od.product_name as productName,
			od.edging_type as edgingType,
			od.remarks,
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			o.create_time as createTime,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S03')) AS colourCeramicGlaze,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')) AS remarks1,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS remarks2,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S06')) AS remarks3,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S07')) AS remarks4,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S08')) AS remarks5,
			p.remarks as filmNumber,
			od.bend_radius as bendRadius,
			od.other_columns,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color,
			'文本' as custom1,
			'文本' as custom2,
			'文本' as custom3,
			'文本' as custom4,
			'文本' as custom5,
			od.quantity,
			o.order_id,
			c.customer_abbreviation as customer_name,
			od.building_number,
			od.processing_note,
			ogd.child_width as childWidth,
			ogd.child_height as childHeight,
			ogd.glass_child as glassChild,
			ogd.process,
			e.type_name,
			opt.stock_id,
			od.bend_radius,
			a.id as flow_card_sort,
			concat(opt.heat_layout_id,'') as heat_layout_id ,
			opt.heat_layout_sort
			from optimize_detail as opt
			left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
			left join sd.order as o on o.order_id=fc.order_id
			left join sd.order_detail as od on fc.order_id = od.order_id and od.order_number = fc.order_number
			left join sd.order_glass_detail as ogd on ogd.order_id=o.order_id and ogd.order_number=od.order_number and ogd.technology_number=fc.technology_number
			left join sd.product as p on p.id = od.product_id
			left join sd.basic_glass_type e on e.type_id = p.type_id
			left join sd.customer as c on c.id = o.customer_id
			left join sd.product_detail as pd on pd.prod_id = p.id and pd.sort_num = od.order_number and
			pd.glass_sort = fc.technology_number
			left join (select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
			on a.process_id=opt.process_id
			where opt.project_no=#{projectNo}
			order by opt.heat_layout_id, opt.heat_layout_sort desc
			</select>

			</mapper>