ERP_override.git

			@@ -543,7 +543,7 @@
			ogds.order_number,
			GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
			ogds.glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR ' ') AS concatenated_glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child,
			SUBSTRING(process, LOCATE('夹胶', process)) AS processed_part
			from sd.order_glass_detail as ogds
			where ogds.order_id = #{orderId}
			@@ -581,7 +581,7 @@
			ogds.order_number,
			GROUP_CONCAT(pds.glass_sort SEPARATOR '') AS technology_number,
			ogds.glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR ' ') AS concatenated_glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child,
			SUBSTRING(pds.process, LOCATE('中空', pds.process)) AS processed_part
			from sd.order_glass_detail as ogds
			left join sd.order_detail as ods
			@@ -615,7 +615,8 @@
			sum(od.weight) as weight,
			#{technologyNumber} as technologyNumber,
			concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
			concat('对应我司单号',o.batch) AS otherRemarks
			concat('对应我司单号',o.batch) AS otherRemarks,
			'' as qrcode
			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
			@@ -1738,8 +1739,8 @@
			o.project,
			ogd.technology_number,
			ogd.glass_address,
			sum(od.quantity) as quantity,
			sum(ogd.total_area) as total_area,
			sum(fc.quantity) as quantity,
			round(sum(ogd.child_widthogd.child_heightfc.quantity/1000000) ,2) as total_area,
			od.product_name,
			ogd.glass_child,
			fc.founder,
			@@ -1787,7 +1788,7 @@
			ogds.order_number,
			GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
			ogds.glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR ' ') AS concatenated_glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child,
			SUBSTRING(process, LOCATE('夹胶', process)) AS processed_part
			from sd.order_glass_detail as ogds
			where ogds.order_id = #{orderId}
			@@ -1825,7 +1826,7 @@
			ogds.order_number,
			GROUP_CONCAT(pds.glass_sort SEPARATOR '') AS technology_number,
			ogds.glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR ' ') AS concatenated_glass_child,
			GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child,
			SUBSTRING(pds.process, LOCATE('中空', pds.process)) AS processed_part
			from sd.order_glass_detail as ogds
			left join sd.order_detail as ods
			@@ -1881,7 +1882,8 @@
			sum(od.weight) as weight,
			#{technologyNumber} as technologyNumber,
			concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
			concat('对应我司单号',o.batch) AS otherRemarks
			concat('对应我司单号',o.batch) AS otherRemarks,
			fc.technology_number as qrcode
			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
			@@ -1904,4 +1906,102 @@
			and position(fc.technology_number in #{technologyNumber})
			group by fc.process_id limit 1
			</select>

			<select id="selectPrintDetailsMp">
			select fc.id,
			fc.order_id,
			fc.process_id,
			o.customer_name,
			o.project,
			ogd.technology_number,
			ogd.glass_address,
			(fc.quantity) as quantity,
			round((ogd.child_widthogd.child_heightfc.quantity/1000000) ,2) as total_area,
			od.product_name,
			ogd.glass_child,
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			/* if(fc.print_status=0,'未打印','已打印') as print_status*/
			fc.print_status,
			ogd.process,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
			od.order_number
			from flow_card as fc
			left join sd.order_glass_detail as ogd
			on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
			ogd.technology_number = fc.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.`order` as o on o.order_id = fc.order_id
			where fc.order_id = #{orderId}
			GROUP BY fc.process_id, od.order_number
			order by fc.process_id,od.order_number
			</select>

			<select id="getPrintCustomDataDetails">
			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,
			width,
			height,
			od.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,
			p.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,
			ogd.glass_child as glassChild,
			ogd.glass_address as glassAddress,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color
			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
			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
			left join sd.order_glass_detail as ogd
			on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
			ogd.technology_number = fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number=#{orderNumber}
			group by fc.process_id,od.order_number, width, height
			order by fc.process_id
			</select>

			<select id="selectUserMp">
			select role_id from
			erp_user_info.`user` as u left join erp_user_info.user_role as ur on u.id=ur.user_id
			where u.login_name=#{userId}
			</select>
			</mapper>