ERP_override.git

			@@ -2226,11 +2226,11 @@

			<select id="remakList">
			SELECT
			JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S01')) AS S01,
			JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S04')) AS S02,
			JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S05')) AS S03,
			JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S06')) AS S04,
			JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S07')) AS S05
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S01')),'') AS S01,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S04')),'') AS S02,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S05')),'') AS S03,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S06')),'') AS S04,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S07')),'') AS S05
			FROM flow_card as fc left join sd.order_detail as od on fc.order_id = od.order_id
			and fc.order_number = od.order_number
			WHERE fc.process_id=#{processId}
			@@ -2250,7 +2250,7 @@
			</select>

			<select id="selectFlowCardMerge">
			select *
			select *,GROUP_CONCAT(DISTINCT fc.technology_number) as count1,count(DISTINCT fc.technology_number) as count2
			from pp.flow_card as fc
			left join sd.order_glass_detail as ogd
			on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
			@@ -2261,8 +2261,11 @@
			</select>

			<update id="updateFlowCardMerge">
			update pp.flow_card fc set fc.merge=1
			where fc.process_id = #{processId}
			update pp.flow_card fc set fc.merge=#{index}
			where fc.process_id = #{processId} and fc.technology_number in
			<foreach item="technologyNumber" collection="technologyNumbers" open="(" separator="," close=")">
			#{technologyNumber}
			</foreach>
			</update>

			<delete id="deleteflowCardSort">