ERP_override.git

			@@ -657,7 +657,7 @@
			fc.quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
			concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,
			od.other_columns,
			round(ogd.child_width) as width,
			@@ -1201,7 +1201,7 @@
			fc.quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
			concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,
			od.other_columns,
			round(ogd.child_width) as width,
			@@ -1273,7 +1273,7 @@
			sum(pl.patch_num) as quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
			concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,
			od.other_columns,
			round(ogd.child_width) as width,
			@@ -1447,7 +1447,7 @@
			(pl.rework_num) as quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
			concat(od.processing_note, od.remarks) as remarks,
			od.other_columns,
			round(ogd.child_width) as width,
			@@ -2103,7 +2103,12 @@
			od.other_columns,
			ogd.glass_child as glassChild,
			ogd.glass_address as glassAddress,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color,
			'文本' as custom1,
			'文本' as custom2,
			'文本' as custom3,
			'文本' as custom4,
			'文本' as custom5
			from sd.order as o
			left join sd.order_detail as od on o.order_id = od.order_id
			left join flow_card as fc on o.order_id = fc.order_id and
			@@ -2121,6 +2126,67 @@
			order by fc.process_id
			</select>

			<select id="getPrintCustomDataProjectNo">
			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,
			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
			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.product as p on p.id = od.product_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
			where opt.project_no=#{projectNo}
			order by opt.stock_id,opt.polys_id
			</select>

			<select id="selectUserMp">
			select role_id
			from erp_user_info.`user` as u