ERP_override.git

			@@ -619,7 +619,7 @@
			left join sd.basic_data as bd on bd.nickname='stepC'
			where ogds.order_id = #{orderId}
			and LOCATE(bd.basic_name, ogds.process) > 0
			GROUP BY order_id, order_number, ogds.group) as ogdss
			GROUP BY order_id, order_number, ogds.group,bd.basic_name LIMIT 1) 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.technology_number
			@@ -662,7 +662,7 @@
			ogds.technology_number
			left join sd.basic_data as bd on bd.nickname='stepD'
			where ogds.order_id = #{orderId}
			GROUP BY order_id, order_number) as ogdss
			GROUP BY order_id, order_number,bd.basic_name LIMIT 1) 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
			@@ -670,7 +670,7 @@
			where process is not null
			and process != ""
			GROUP BY order_id, process_id, technology_number, process
			order by order_id, process_id, length(technology_number)) as result
			order by order_id, process_id, length(technology_number),technology_number) as result
			LEFT JOIN (SELECT * from flow_card GROUP BY process_id,technology_number) as fcc
			on result.process_id = fcc.process_id and result.technology_number = fcc.technology_number
			</select>
			@@ -1021,7 +1021,7 @@
			ogd.glass_address,
			ogd.child_width,
			ogd.child_height,
			fc.quantity,
			sum(fc.quantity) as quantity,
			ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
			ifnull(fcs.sort, '') as sort,
			ogd.glass_child,
			@@ -1113,7 +1113,24 @@
			od.processing_note as processingNote,
			width,
			height,
			fc.quantity,
			#{printQuantity} as quantity,
			CONCAT(
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',#{printQuantity} ) as size,

			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',#{printQuantity} ) as numberSize,
			CONCAT(
			od.order_number,')',' ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR)))) as numberSizeQuantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -1123,6 +1140,7 @@
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			@@ -1137,7 +1155,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
			@@ -1185,6 +1208,7 @@
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			@@ -1285,6 +1309,7 @@
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			@@ -1300,14 +1325,23 @@
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',pl.patch_num ) as size,

			' = ',pl.patch_num ) as size,
			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',pl.patch_num ) as numberSize
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',pl.patch_num ) as numberSize,
			CONCAT(
			od.order_number,')',' ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR)))) as numberSizeQuantity,
			'文本' 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
			@@ -1967,6 +2001,11 @@
			ogd.glass_address as glassAddress,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color,
			CONCAT(
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),
			' = ',fc.quantity ) as size,
			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			@@ -1976,7 +2015,12 @@
			od.order_number,')',' ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR)))) as numberSizeQuantity
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR)))) as numberSizeQuantity,
			'文本' 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
			@@ -2174,6 +2218,7 @@
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			CONCAT(fc.process_id, '/', fc.technology_number) as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			@@ -2192,14 +2237,23 @@
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),
			' = ',pl.patch_num ) as size,

			' = ',pl.patch_num ) as size,
			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),
			' = ',pl.patch_num ) as numberSize
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),
			' = ',pl.patch_num ) as numberSize,
			CONCAT(
			od.order_number,')',' ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR)))) as numberSizeQuantity,
			'文本' 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
			@@ -2365,6 +2419,7 @@

			<select id="getPrimaryListLimt">
			select o.customer_name,
			if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,
			o.project,
			#{process} process,
			od.edging_type,
			@@ -2592,6 +2647,7 @@
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			@@ -2752,6 +2808,7 @@
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			@@ -2814,6 +2871,7 @@
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			@@ -3105,11 +3163,16 @@
			' = ',#{printQuantity} ) as size,

			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',#{printQuantity} ) as numberSize,
			CONCAT(
			od.order_number,')',' ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR)))) as numberSizeQuantity,
			od.order_number as orderNumber,
			ogd.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -3119,6 +3182,7 @@
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			'' as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			@@ -3325,4 +3389,91 @@
			</otherwise>
			</choose>
			</select>

			<select id="getPrintCustomDataSemiTj">
			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,
			ogd.child_width as width,
			ogd.child_height as height,
			fc.quantity,
			CONCAT(ogd.child_width , ' X ', ogd.child_height ,' = ',fc.quantity ) as size,
			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,
			CONCAT(fc.process_id, '/', fc.technology_number) as processId,
			SUBSTRING(fc.process_id,12 ) as processIdAD ,/-流程卡简写-/
			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,
			ogd.glass_child as glassChild,
			ogd.glass_address as glassAddress,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color,
			CONCAT(
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',fc.quantity ) as size,
			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),
			' = ',fc.quantity ) as numberSize,
			CONCAT(
			od.order_number,')',' ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR)))) as numberSizeQuantity,
			'文本' 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
			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
			left join sd.order_glass_detail ogd
			on ogd.order_id = o.order_id and ogd.order_number = od.order_number and
			ogd.technology_number = fc.technology_number
			left join flow_card_sort as fcs
			on fcs.process_id = fc.process_id and fcs.order_number = fc.order_number and
			fcs.technology_number = fc.technology_number
			and fcs.process = #{process}
			where fc.process_id = #{processId}
			and position(fc.technology_number in #{technologyNumber})
			group by fc.process_id,od.order_number, ogd.technology_number, ogd.child_width, ogd.child_height
			order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
			</select>
			</mapper>