ERP_override.git

			@@ -257,6 +257,7 @@
			ifnull(p.thickness,'') as thickness,
			od.weight,
			od.remarks,
			od.processing_note,
			ifnull(od.bend_radius,'') as bend_radius,
			ods.S01,
			ods.S02,
			@@ -720,7 +721,7 @@
			od.other_columns,
			od.bend_radius,
			od.order_number as heat_layout_id,
			ogd.technology_number as heat_layout_sort
			a.id as heat_layout_sort
			from pp.optimize_detail opd
			left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
			left join sd.order_detail od
			@@ -731,6 +732,9 @@
			left join sd.product p on od.product_id = p.id
			left join sd.basic_glass_type e on e.type_id = p.type_id
			left join sd.customer c on c.id = o.customer_id
			left join
			(select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
			on a.process_id=opd.process_id
			where opd.project_no = #{projectNo}
			order by opd.stock_id
			</select>
			@@ -2246,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
			@@ -2257,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">