ERP_override.git

			@@ -151,6 +151,7 @@
			<result column="stockArea" property="stockArea"/>
			<result column="product_name" property="productName"/>
			<result column="bend_radius" property="bendRadius"/>
			<result column="glassNumber" property="glassNumber"/>
			</resultMap>

			<!-- 流程卡进度-->
			@@ -168,7 +169,7 @@
			ifnull(f.inventory, 0) as inventory,
			round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
			ifnull(dd.quantity, 0) as shippedQuantity,
			JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
			from flow_card as c
			left join
			sd.order_detail as a
			@@ -335,7 +336,8 @@
			(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
			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

			from sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			@@ -397,6 +399,9 @@
			</if>
			<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
			and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
			</if>
			<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
			</if>
			group by fc.process_id, fc.order_number, fc.technology_number
			order by fc.process_id, fc.order_number, fc.technology_number
			@@ -539,7 +544,7 @@
			round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,
			IFNULL(dd.responsible_personnel,'') as personnel,
			ogd.glass_child,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
			FROM
			sd.ORDER AS o
			LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
			@@ -748,7 +753,7 @@
			round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
			ifnull(dd.quantity, 0) as shippedQuantity,
			ifnull(dd.area, 0) as area,
			JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber

			from flow_card as c
			left join