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}
			@@ -1704,6 +1706,7 @@
			</select>

			<select id="teamOutputMp" resultMap="teamOutputMap">

			SELECT
			t.*,
			-- 玻璃总厚度（mm）
			@@ -1839,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,
			@@ -1852,39 +1855,84 @@

			<select id="exportTeamOutputMp">
			SELECT
			t.*,
			-- 玻璃总厚度（mm）
			(
			SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
			'$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
			) jt
			) AS thicknessSum,
			ROUND(
			(
			SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
			'$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
			) jt2
			) * t.area,
			2
			) AS thicknessArea
			FROM
			(
			SELECT
			rw.reporting_work_time,
			rw.this_process,
			rw.teams_groups_name,
			o.project,
			o.order_id,
			rw.process_id,
			fc.order_number,
			MAX( ogd.child_width ) as width,
			MAX( ogd.child_height ) as height,
			MAX(ogd.child_width) AS width,
			MAX(ogd.child_height) AS height,
			od.edging_type,
			rwd.completed_quantity as completed_quantity,
			ROUND(MAX( ogd.child_width )MAX( ogd.child_height )rwd.completed_quantity/1000000,2) as area,
			rwd.completed_quantity AS completed_quantity,
			ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
			od.product_name,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS code,
			rw.reviewed,
			rw.examine_time,
			rw.device_name,
			o.order_type,
			-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
			CASE
			WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX( ogd.glass_child )
			WHEN LOCATE('step', #{laminating}) > 0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX(ogd.glass_child)
			END AS workProcessName,
			o.batch
			FROM
			reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
			left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.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
			left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
			left join sd.`order` as o on o.order_id=od.order_id
			where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
			rw.reporting_work_time >= #{date[0]}
			pp.reporting_work AS rw
			LEFT JOIN pp.reporting_work_detail AS rwd
			ON rwd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN pp.flow_card AS fc
			ON fc.order_id = rw.order_id
			AND fc.process_id = rw.process_id
			AND fc.order_number = rwd.order_number
			AND fc.technology_number = rwd.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
			LEFT JOIN sd.order_detail AS od
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			LEFT JOIN sd.`order` AS o
			ON o.order_id = od.order_id
			WHERE
			o.create_order > 0
			AND rw.reviewed_state >= 0
			AND rwd.completed_quantity > 0
			AND rw.reporting_work_time >= #{date[0]}
			AND rw.reporting_work_time < #{date[1]}
			and position(#{process} in rw.this_process)
			<choose>
			<!-- 有传工序：精确匹配 -->
			<when test="process != null and process != ''">
			AND rw.this_process = #{process}
			</when>
			<!-- 未传工序：不加限制，查所有） -->
			<otherwise>
			</otherwise>
			</choose>
			<choose>
			<when test="laminating == ''">
			GROUP BY
			@@ -1897,7 +1945,7 @@
			</when>
			<otherwise>
			GROUP BY
			<if test="laminating == 'stepA' \|\| laminating == 'stepC'" >
			<if test="laminating == 'stepA' \|\| laminating == 'stepC'">
			ogd.`group`,
			</if>
			rw.reporting_work_id,
			@@ -1907,12 +1955,13 @@
			rwd.order_number
			</otherwise>
			</choose>
			) t
			ORDER BY
			rw.this_process,
			rw.process_id,
			rwd.order_number,
			rw.reporting_work_time,
			rw.teams_groups_name
			t.this_process,
			t.process_id,
			t.order_number,
			t.reporting_work_time,
			t.teams_groups_name
			</select>

			<select id="teamOutputPageTotal">
			@@ -2059,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}
			@@ -2828,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}