ERP_override.git

			@@ -853,7 +853,8 @@
			od.other_columns,
			od.bend_radius,
			od.order_number as heat_layout_id,
			a.id as heat_layout_sort
			a.id as heat_layout_sort,
			od.product_name
			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
			@@ -888,7 +889,8 @@
			od.other_columns,
			od.bend_radius,
			opd.heat_layout_id,
			opd.heat_layout_sort
			opd.heat_layout_sort,
			od.product_name
			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
			@@ -2317,7 +2319,9 @@
			fc.print_status,
			ogd.process,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
			od.order_number
			od.order_number,
			od.width,
			od.height
			from flow_card as fc
			left join sd.order_glass_detail as ogd
			on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
			@@ -2348,7 +2352,9 @@
			fc.print_status,
			ogd.process,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
			od.order_number
			od.order_number,
			ogd.child_width as width,
			ogd.child_height as height
			from flow_card as fc
			left join sd.order_glass_detail as ogd
			on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
			@@ -2902,4 +2908,17 @@
			group by a.order_number) as c
			order by c.`long` desc
			</select>

			<!-- 复选框修改排版状态-->
			<update id="revokeComposing">
			update flow_card as fc
			set fc.layout_status=0
			where fc.process_id = #{processId}
			</update>

			<select id="selectProjectNo">
			SELECT COUNT(*)
			FROM flow_card
			WHERE process_id= #{processId} and project_no IS not NULL;
			</select>
			</mapper>