ERP_override.git

			@@ -732,7 +732,8 @@
			fc.quantity - odpd.reporting_work_num - ifnull(fc.termination_quantity,0) as incompleteNum,
			ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num- ifnull(fc.termination_quantity,0)) / 1000000,
			2) as incompleteArea,
			od.product_name
			od.product_name,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness

			from sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			@@ -750,6 +751,7 @@
			and odpd.process_id = fc.process_id
			left join sd.`order` as o
			on o.order_id = od.order_id
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			where o.create_order>0
			and odpd.process = #{selectProcesses}
			and o.create_time >= #{selectTime1}
			@@ -1840,7 +1842,7 @@
			</if>
			HAVING 1 = 1
			<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
			AND thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
			and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
			</if>
			ORDER BY
			t.this_process,
			@@ -2106,7 +2108,7 @@
			) x
			WHERE 1 = 1
			<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
			AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
			and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
			</if>
			<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
			AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
			@@ -2875,7 +2877,7 @@
			) x
			WHERE 1 = 1
			<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
			AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
			and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
			</if>
			<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
			AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}