ERP_override.git

			@@ -254,10 +254,10 @@
			ROUND(od.quantity-IFNULL(sum(fc.quantity)/count(fc.technology_number),0)) as baiscQuantity,
			od.compute_gross_area as 'computeGrossArea',
			p.total_thickness AS 'totalThickness',
			p.thickness,
			ifnull(p.thickness,'') as thickness,
			od.weight,
			od.remarks,
			od.bend_radius,
			ifnull(od.bend_radius,'') as bend_radius,
			ods.S01,
			ods.S02,
			ods.S03,
			@@ -471,7 +471,7 @@
			where create_time between #{selectTime1} and #{selectTime2}
			and position(#{orderId} in order_id)
			and position(#{project} in project)
			and processing_card = 2
			and processing_card >0
			order by create_time desc
			</select>

			@@ -808,7 +808,8 @@
			ifnull(fcs.sort, '') as sort,
			ogd.glass_child,
			#{process} as process,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
			od.bend_radius
			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
			@@ -1241,7 +1242,11 @@
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			pd.separation,
			fc.technology_number
			fc.technology_number,
			pl.patch_type,
			pl.patch_reason,
			pl.patch_processes,
			pl.responsible_team
			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
			@@ -1255,7 +1260,8 @@
			and fc.order_number = #{orderNumber}
			and position(fc.technology_number in #{technologyNumber})
			and pl.reporting_work_id = #{reportingWorkId}
			group by fc.process_id, fc.order_number, fc.technology_number
			and pl.patch_reason = #{patchReason}
			group by fc.process_id, fc.order_number, fc.technology_number,pl.id
			order by IF(sort != NULL and sort != '', sort, fc.order_number)
			</select>

			@@ -1310,6 +1316,7 @@
			and fc.order_number = #{orderNumber}
			and fc.technology_number = #{technologyNumber}
			and rw.reporting_work_id = #{reportingWorkId}
			and dd.breakage_reason = #{patchReason}
			group by fc.process_id, fc.technology_number
			</select>

			@@ -1362,7 +1369,8 @@
			dd.responsible_process,
			dd.responsible_team,
			concat('对应我司单号', o.batch) AS otherRemarks,
			dd.responsible_personnel
			dd.responsible_personnel,
			pl.rework_id as patch_id
			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
			@@ -1407,7 +1415,12 @@
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			pd.separation,
			fc.technology_number
			fc.technology_number,
			pl.rework_type as patch_type,
			pl.rework_reason as patch_reason,
			pl.rework_processes as patch_processes,
			pl.responsible_team,
			pl.rework_team
			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