ERP_override.git

			@@ -1124,12 +1124,14 @@
			ogd.child_width,
			ogd.child_height,
			odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
			odpd.broken_num as stockNum,
			odpd.broken_num as stockNum,
			ROUND(ogd.child_width * ogd.child_height *
			(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
			odpd.broken_num) / 1000000, 2) as stockArea,
			odpd.broken_num) / 1000000, 2) as stockArea,
			od.product_name,
			od.bend_radius
			od.bend_radius,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
			rws.teams_groups_name

			from sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			@@ -1149,7 +1151,7 @@
			ON odpds.id = odpd.id - 1
			left join
			(SELECT sum(rw.rework_num) as 'patchNumSum',
			rw.process_id,
			rw.process_id,
			rw.order_sort,
			rw.technology_number,
			rwk.this_process
			@@ -1165,6 +1167,14 @@
			and c.technology_number = fc.technology_number
			left join sd.`order` as o
			on o.order_id = od.order_id
			left join
			(
			select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
			from reporting_work as a
			left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
			GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
			) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
			and rws.technology_number=fc.technology_number and rws.next_process=#{process}
			where o.create_order>0
			and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
			odpd.broken_num != 0
			@@ -1339,7 +1349,7 @@
			rw.examine_time,
			-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
			CASE
			WHEN #{laminating} = 'laminating' THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX( ogd.glass_child )
			END AS workProcessName
			FROM
			@@ -1369,7 +1379,7 @@
			</if>

			<choose>
			<when test="laminating != 'laminating'">
			<when test="laminating == ''">
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			@@ -1482,7 +1492,7 @@
			</if>

			<choose>
			<when test="laminating != 'laminating'">
			<when test="laminating == ''">
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			@@ -1893,7 +1903,9 @@
			SUM(od.quantity) AS quantity,
			SUM(odpds.reporting_work_num_count + IFNULL(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num) AS stockNum,
			SUM(ROUND(ogd.child_width * ogd.child_height *
			(odpds.reporting_work_num_count + IFNULL(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num) / 1000000, 2)) AS stockArea
			(odpds.reporting_work_num_count + IFNULL(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num) / 1000000, 2)) AS stockArea,
			CEILING(count(fc.id)/#{pageSize}) as 'pageTotal',
			count(distinct fc.id) as 'total'
			FROM sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			@@ -1965,7 +1977,6 @@
			<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
			and fc.process_id regexp #{workInProgressDTO.processId}
			</if>
			order by o.order_id, fc.process_id
			</select>

			<select id="processToBeCompletedFootSum">
			@@ -2097,7 +2108,7 @@
			and od.edging_type regexp #{teamOutputDTO.edgingType}
			</if>
			<choose>
			<when test="laminating != 'laminating'">
			<when test="laminating == ''">
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,