ERP_override.git

			@@ -179,6 +179,73 @@
			</select>



			<select id="directOptimization">
			(SELECT
			c.project_no,
			d.child_width as 'width',
			d.child_height as 'height',
			c.quantity,
			concat( c.process_id, '-', c.technology_number ) AS 'process_id',
			c.process_id AS processId,
			c.technology_number as layer,
			c.layers_number as totalLayer,
			round( d.area * c.quantity, 4 ) as 'area',
			c.order_number,
			d.icon AS markIcon,
			op.project_name,
			0 as patchState,
			c.rack AS rackNo,
			0 as layoutId
			FROM
			pp.flow_card c
			LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
			AND c.order_number = d.order_number
			AND c.technology_number = d.technology_number
			INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
			WHERE
			c.project_no IS NOT NULL
			and c.project_no = #{projectNo}
			ORDER BY
			c.process_id,
			c.order_number
			) union
			(
			SELECT
			c.project_no,
			d.child_width as 'width',
			d.child_height as 'height',
			c.patch_num as quantity,
			concat( c.process_id, '-', c.technology_number ) AS 'process_id',
			c.process_id AS 'process_ids',
			c.technology_number as layer,
			fc.layers_number as total_layer,
			round( d.area * c.patch_num, 4 ) as 'area',
			c.order_sort as order_number,
			d.icon,
			op.project_name,
			1 as patch_state,
			a.id as rackNo,
			0 as layoutId
			FROM
			pp.patch_log c
			LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
			AND c.order_sort = d.order_number
			AND c.technology_number = d.technology_number
			INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
			LEFT JOIN pp.flow_card fc ON c.process_id = fc.process_id and fc.technology_number=c.technology_number
			left join
			(select (@row_number := @row_number + 1) as id,process_id as process_id,technology_number as technology_number from (select process_id,technology_number from pp.flow_card tt where project_no =#{projectNo} group by process_id,technology_number) tt,(select @row_number := 0) as t) a
			on a.process_id=c.process_id and a.technology_number=c.technology_number
			WHERE
			c.project_no IS NOT NULL
			and c.project_no = #{projectNo}
			ORDER BY
			a.id,
			c.process_id,
			c.order_sort)
			</select>

			<!--优化查询-->
			<select id="analogComputationOptimization">
			SELECT
			@@ -240,10 +307,56 @@
			</select>


			<!--优化查询-->
			<select id="computeAndOptimization">
			SELECT
			c.rack AS rackNo,
			h.layout_id as layoutId,
			h.width AS width,
			h.height AS height,
			count( 1 ) AS quantity,
			concat( h.process_id, '-', h.layer ) AS processId,
			h.process_id as process_ids,
			h.layer,
			c.layers_number as totalLayer,
			round( d.area * count( 1 ), 4 ) AS 'area',
			c.order_number,
			h.order_sort AS orderSort,
			d.icon AS markIcon,
			h.patch_state AS patchState
			from
			pp.`optimize_heat_detail` h
			LEFT JOIN pp.flow_card c ON h.process_id = c.process_id
			AND h.layer = c.technology_number
			AND h.order_sort = c.order_number
			LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
			AND c.order_number = d.order_number
			AND c.technology_number = d.technology_number
			WHERE
			h.project_no = #{projectNo}
			GROUP BY
			h.layout_id,
			h.width,
			h.height,
			h.process_id,
			h.layer,
			d.area,
			c.quantity,
			d.child_width,
			d.child_height,
			c.order_number,
			d.icon
			ORDER BY
			LENGTH( h.layout_id ),
			h.layout_id;
			</select>



			<select id="getOptimizeDetail">
			SELECT
			h.project_no,
			h.heat_layout_id as rackNo,
			h.rack_no as rackNo,
			h.o_width AS width,
			h.o_height AS height,
			(h.height-h.o_height)/2 as shortGrind1,
			@@ -280,14 +393,14 @@
			h.project_no =#{projectNo}
			GROUP BY
			h.project_no,
			h.heat_layout_id,
			h.rack_no,
			h.width,
			h.height,
			h.process_id,
			h.layer,
			c.order_number
			ORDER BY
			h.heat_layout_id;
			h.rack_no;
			</select>

			<!--工程信息流程卡-->
			@@ -1118,7 +1231,8 @@
			x_axis,
			y_axis,
			patch_state,
			mark_icon
			mark_icon,
			rack_no
			) VALUES (
			#{projectId},
			#{glass.processId},
			@@ -1134,7 +1248,8 @@
			#{glass.x},
			#{glass.y},
			#{glass.patchState},
			#{glass.markIcon}
			#{glass.markIcon},
			#{glass.rackNo}
			);
			</foreach>
			</insert>
			@@ -1307,10 +1422,25 @@
			from pp.optimize_config oc where config_type=4 and creater=#{username}
			</select>


			<select id="getGrindingOptimize">
			select
			CAST(REPLACE(JSON_EXTRACT( oc.config_detail, '$.left_edge' ), '"', '') AS DECIMAL(10,2)) as leftGrind,
			CAST(REPLACE(JSON_EXTRACT( oc.config_detail, '$.up_edge' ), '"', '') AS DECIMAL(10,2)) as upGrind,
			CAST(REPLACE(JSON_EXTRACT( oc.config_detail, '$.right_edge' ), '"', '') AS DECIMAL(10,2)) as rightGrind,
			CAST(REPLACE(JSON_EXTRACT( oc.config_detail, '$.down_edge' ), '"', '') AS DECIMAL(10,2)) as downGrind
			from pp.optimize_config oc where config_type=4 and creater=#{username}
			</select>

			<update id="updateOptimizeConfig">
			UPDATE pp.optimize_config set config_detail=#{json},create_time=now()
			where config_type=#{type} and creater=#{username}
			</update>
			<update id="updateFlowCardRack">
			UPDATE pp.flow_card
			SET rack = #{rackValue}
			WHERE process_id = #{processId} AND technology_number = #{technologyNumber}
			</update>

			<select id="simulatedTypesettingUsingOpt">
			SELECT