ERP_override.git

			@@ -208,7 +208,8 @@
			ogd.`group`,
			if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
			od.other_columns,
			ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state,if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
			ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state,
			if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
			od.building_number) as s01Value

			@@ -434,6 +435,9 @@
			ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 本工序完工和
			if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
			e.other_columns,
			if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
			od.building_number) as s01Value
			IF(count(pl.id)>0,'已补片','') as patchStatusOther,

			<if test="nextProcess != null and nextProcess != ''"> -- 非最后一道工序
			@@ -926,6 +930,11 @@

			SELECT * FROM sd.basic_data
			WHERE basic_type='product' AND basic_category='process' AND basic_name='钢化'

			UNION

			SELECT * FROM sd.basic_data
			WHERE basic_type='product' AND basic_category='process' AND basic_name='热弯'
			) AS combined_results;
			</select>