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>

			<!--工程信息流程卡-->
			@@ -545,7 +658,7 @@
			数量 as quantity,
			形状 as shape,
			项目 as project,
			单片名称 as glass_child,
			产品名称 as glass_child,
			面积 as area,
			GlassType as glassType,
			patch_state
			@@ -561,7 +674,7 @@
			数量 as quantity,
			形状 as shape,
			项目 as project,
			单片名称 as glass_child,
			产品名称 as glass_child,
			面积 as area,
			GlassType as glassType,
			patch_state
			@@ -577,7 +690,7 @@
			数量 as quantity,
			形状 as shape,
			项目 as project,
			单片名称 as glass_child,
			产品名称 as glass_child,
			面积 as area,
			GlassType as glassType,
			patch_state
			@@ -633,7 +746,7 @@
			from pp.optimize_project as p
			left join pp.optimize_admin as a on p.creater = a.Id
			where (`p`.`state` > 0)
			and (tempering_state>0 or optimize_state>0)
			# and (tempering_state>0 or optimize_state>0)
			and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
			<if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
			and p.project_no regexp #{optimizeProjectMange.projectNumber}
			@@ -727,7 +840,8 @@
			p.remark,
			a.name,
			p.create_time,
			p.update_time
			p.update_time,
			p.optimize_state
			FROM
			(
			pp.optimize_project p
			@@ -1117,7 +1231,9 @@
			x_axis,
			y_axis,
			patch_state,
			mark_icon
			mark_icon,
			isRotate,
			rack_no
			) VALUES (
			#{projectId},
			#{glass.processId},
			@@ -1133,7 +1249,9 @@
			#{glass.x},
			#{glass.y},
			#{glass.patchState},
			#{glass.markIcon}
			#{glass.markIcon},
			#{glass.isRotate},
			#{glass.rackNo}
			);
			</foreach>
			</insert>
			@@ -1226,6 +1344,28 @@
			);
			</foreach>
			</insert>
			<insert id="addOptimizeOffcut">
			INSERT INTO pp.optimize_offcut (
			project_no,
			stock_id,
			width,
			height,
			x_axis,
			y_axis,
			model,
			thickness
			) VALUES (
			#{projectId},
			#{map.stockSort},
			#{map.width},
			#{map.height},
			#{map.x},
			#{map.y},
			#{glassType},
			#{glassThickness}

			)
			</insert>


			<!--模拟计算工程更新-->
			@@ -1306,9 +1446,24 @@
			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">
			@@ -1360,7 +1515,7 @@
			数量 as quantity,
			形状 as shape,
			项目 as project,
			单片名称 as glass_child,
			产品名称 as glass_child,
			面积 as area,
			GlassType as glassType,
			patch_state
			@@ -1468,6 +1623,37 @@
			fc.layer,
			fc.order_number
			</select>
			<select id="getProjectByProjectNoSv" resultType="java.util.Map">
			SELECT
			p.id,
			p.project_no as projectNumber,
			p.project_name,
			p.glass_type,
			p.glass_thickness,
			p.type,
			p.state,
			p.glass_total as quantity,
			p.glass_total_area,
			p.process_qty,
			p.process_cards,
			p.remark,
			a.name,
			p.create_time,
			p.update_time,
			p.optimize_state
			FROM
			(
			pp.optimize_project p
			LEFT JOIN pp.optimize_admin a ON ((
			p.creater = a.Id
			)))
			WHERE
			( p.state = 1 ) and p.tempering_state=0 and optimize_state=0 and p.project_no = #{projectNo}
			ORDER BY
			p.create_time DESC,
			p.project_no

			</select>

			<delete id="deleteOptimizeDetailThirdParty">
			delete from pp.other_flow_card
			@@ -1475,9 +1661,128 @@
			</delete>


			<select id="selectOptimizeProject">
			select
			project_no as engineerId,
			project_name as engineerName,
			avg_cut_pct as avgAvailability,
			valid_cut_pct as validAvailability,
			last_cut_pct as lastAvailability,
			glass_total as glassTotal,
			glass_total_area as glassTotalArea,
			raw_stock_qty as planPatternTotal,
			raw_stock_area as planPatternTotalArea,
			glass_thickness as thickness,
			glass_type as filmsId
			from
			pp.optimize_project
			where
			project_no = #{projectNo}
			</select>

			<select id="selectOptimizeLayout">
			select
			ol.project_no as engineeringId,
			op.glass_type as filmsId,
			ol.realwidth as rawGlassWidth,
			ol.realheight as rawGlassHeight,
			op.glass_thickness as rawGlassThickness,
			ol.stock_id rawSequence
			from
			pp.optimize_layout ol
			left join pp.optimize_project op on ol.project_no = op.project_no
			where
			ol.project_no = #{projectNo}
			order by
			ol.stock_id
			</select>


			<select id="selectOptimizeDetail">
			select
			opd.glass_id as glassId,
			opd.project_no as engineerId,
			opd.process_id as flowCardId,
			opd.order_sort as orderNumber,
			opd.o_width as width,
			opd.o_height as height,
			op.glass_thickness as thickness,
			op.glass_type as filmsId,
			opd.total_layer as totalLayer,
			opd.layer,
			opd.stock_id as rawSequence,
			opd.p_width as edgWidth,
			opd.p_height as edgHeight,
			opd.x_axis as xAxis,
			opd.y_axis as yAxis,
			if(opd.o_width!=opd.width,1,0) as rawAngle,
			opd.heat_layout_id as temperingLayoutId,
			opd.heat_layout_sort as temperingFeedSequence,
			ohd.x_axis as xCoordinate,
			ohd.y_axis as yCoordinate,
			ohd.rotate_angle as angle,
			IF(LOCATE('中空', ogd.process ) > 0 or LOCATE('夹层', ogd.process ) > 0, 1, 0) as isMultiple,
			od.width as maxWidth,
			od.height as maxHeight,
			opd.mark_icon as markIcon,
			fc.`merge` as combine,
			concat( opd.process_id, '/', opd.layer ) as flowCardSequence,
			ogd.process
			from
			pp.optimize_detail opd
			left join pp.optimize_project op on op.project_no = opd.project_no
			left join pp.flow_card fc on opd.process_id = fc.process_id
			and opd.layer = fc.technology_number
			and opd.order_sort = order_number
			left join sd.`order` o on fc.order_id = o.order_id
			left join sd.order_detail od on fc.order_id = od.order_id
			and fc.order_number = od.order_number
			left join sd.order_glass_detail ogd on fc.order_id = ogd.order_id
			and fc.order_number = ogd.order_number
			and ogd.technology_number = fc.technology_number
			left join pp.optimize_heat_detail ohd on ohd.layout_id = opd.heat_layout_id
			and ohd.sort = opd.heat_layout_sort and ohd.project_no=opd.project_no
			where
			opd.project_no = #{projectNo}
			</select>

			<select id="selectFlowCardInfoList">
			select
			fc.process_id as flowCardId,
			ogd.child_width as width,
			ogd.child_height as height,
			REPLACE (JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.thickness' )), 'mm', '' ) as thickness,
			JSON_UNQUOTE(JSON_EXTRACT( pd.separation, '$.color' )) as filmsId,
			fc.layers_number as totalLayer,
			fc.technology_number as layer,
			fc.quantity as glassTotal,
			od.order_number as orderNumber,
			od.product_name as productName,
			o.customer_name as customerName
			from
			pp.flow_card fc
			left join sd.`order` o on fc.order_id = o.order_id
			left join sd.order_detail od on fc.order_id = od.order_id
			and fc.order_number = od.order_number
			left join sd.order_glass_detail ogd on fc.order_id = ogd.order_id
			and fc.order_number = ogd.order_number
			and ogd.technology_number = fc.technology_number
			left join sd.product p on od.product_id = p.id
			left join sd.product_detail pd on od.product_id = pd.prod_id
			and fc.technology_number = pd.glass_sort
			where
			project_no =#{projectNo}
			</select>
			<select id="getGlassInfo" resultType="java.util.Map">
			select
			project_no,
			glass_type,
			glass_thickness
			from
			pp.optimize_project
			where
			project_no = #{projectId}
			</select>


			</mapper>