ERP_override.git

			@@ -169,6 +169,7 @@
			b.glass_child,
			d.order_type,
			concat(c.process_id, '/', c.technology_number) as process_id,
			c.order_id,
			c.order_number,
			c.technology_number,
			b.child_width,
			@@ -193,7 +194,9 @@
			if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,


			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
			b.`group`

			from pp.flow_card as c
			left join
			sd.order_detail as a
			@@ -2110,7 +2113,7 @@
			WHERE
			rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			AND dd.available = 0
			AND dd.available = 0 and rw.reviewed_state>=0
			<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
			and o.order_id regexp #{damageReportDTO.orderId}
			</if>
			@@ -2684,7 +2687,7 @@
			e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
			(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
			from (SELECT a.order_id,
			a.project,
			if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
			C.product_id,
			b.order_number,
			b.process_id,
			@@ -2733,7 +2736,8 @@
			on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
			where
			e.id is not null
			and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 ) as g
			and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 group by f.process_id, f.order_number,
			f.technology_number) as g
			<choose>
			<when test="laminating == 'stepC' and process == '预压'">
			GROUP BY g.process_id, g.order_number, g.technology_number
			@@ -2822,7 +2826,8 @@
			on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
			where
			e.id is not null
			and e.reporting_work_num_count-f.reporting_work_num_count>0 ) as g
			and e.reporting_work_num_count-f.reporting_work_num_count>0 group by f.process_id, f.order_number,
			f.technology_number) as g
			<choose>
			<when test="laminating == 'stepC' and process == '预压'">
			GROUP BY g.process_id, g.order_number, g.technology_number