ERP_override.git

			@@ -118,7 +118,7 @@
			a.id as rackNo
			FROM
			pp.flow_card c
			LEFT JOIN sd.order_detail o ON c.order_id = o.order_id
			LEFT JOIN sd.order_detail o ON c.order_id = o.order_id and c.order_number = o.order_number
			AND c.order_number = o.order_number
			LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
			AND c.order_number = d.order_number
			@@ -211,7 +211,8 @@
			AND c.technology_number = d.technology_number
			INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
			LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
			LEFT JOIN order_detail od ON c.order_id = od.order_id
			LEFT JOIN sd.order_detail od ON c.order_id = od.order_id
			AND c.order_number = od.order_number
			WHERE
			c.project_no IS NOT NULL
			and c.project_no = #{projectNo}
			@@ -251,7 +252,8 @@
			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 sd.ORDER o ON o.order_id = c.order_id
			LEFT JOIN order_detail od ON c.order_id = od.order_id
			LEFT JOIN sd.order_detail od ON fc.order_id = od.order_id
			AND fc.order_number = od.order_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
			@@ -358,7 +360,7 @@
			AND c.order_number = d.order_number
			AND c.technology_number = d.technology_number
			LEFT JOIN sd.order o on o.order_id = c.order_id
			LEFT JOIN order_detail od on c.order_id = od.order_id
			LEFT JOIN sd.order_detail od on c.order_id = od.order_id and c.order_number = od.order_number
			WHERE
			h.project_no = #{projectNo}
			GROUP BY
			@@ -580,7 +582,8 @@
			ou.right_trim as rightTrim,
			JSON_EXTRACT(ms.json, '$.thickness') AS thickness,
			JSON_EXTRACT(ms.json, '$.name') AS name,
			JSON_EXTRACT(ms.json, '$.model') AS model
			JSON_EXTRACT(ms.json, '$.model') AS model,
			(ou.width * ou.height * ou.use_count / 1000000.0) AS totalArea
			from pp.optimize_use ou
			left join mm.material_store ms on ou.raw_stock_code=ms.id where project_no=#{projectNumber} and state=1
			</select>
			@@ -793,7 +796,9 @@
			<!--修改模拟计算工程状态-->
			<update id="updateProjectTemperingStateMp">
			update pp.optimize_project as p
			set p.tempering_state = #{states}
			set p.tempering_state = #{states},
			p.load_rate = NULL,
			p.furnaces_qty = NULL
			where p.project_no = #{projectNumber}
			</update>

			@@ -1154,7 +1159,7 @@
			NOW(),
			NOW(),
			0,
			#{glass.layers_number},
			#{glass.technology_number},
			#{glass.order_number},
			#{glass.tempering_layout_id},
			#{glass.tempering_feed_sequence},
			@@ -1251,16 +1256,17 @@
			order_sort,
			stock_id,
			polys_id,
			o_width,
			o_height,
			p_width,
			p_height,
			width,
			height,
			x_axis,
			y_axis,
			patch_state,
			mark_icon,
			isRotate,
			glass_point,
			glass_id,
			rack_no
			) VALUES (
			#{projectId},
			@@ -1280,6 +1286,11 @@
			#{glass.markIcon},
			#{glass.isRotate},
			#{glass.glassPoint},
			CONCAT(
			LPAD(SUBSTR(#{projectId}, 2), 8, '0'),
			LPAD(#{glass.stockSort}, 4, '0'),
			LPAD(#{glass.polySort}, 6, '0')
			),
			#{glass.rackNo}
			);
			</foreach>
			@@ -1457,7 +1468,7 @@

			<update id="updateOptimizeDetail">
			update pp.optimize_detail
			set heat_layout_id=#{layoutId},heat_layout_sort=#{sort},glass_id=concat(process_id,'\|',#{layoutId},'\|',#{sort})
			set heat_layout_id=#{layoutId},heat_layout_sort=#{sort}
			where id=#{id};
			</update>

			@@ -1515,6 +1526,23 @@
			UPDATE pp.optimize_config set config_detail=#{json},create_time=now()
			where config_type=#{type} and creater=#{username}
			</update>
			<insert id="insertOptimizeConfig">
			INSERT INTO pp.optimize_config (
			config_type,
			config_name,
			creater,
			config_detail,
			state,
			create_time
			) VALUES (
			#{type},
			#{configName},
			#{userName},
			#{json},
			1,
			now()
			)
			</insert>
			<update id="updateFlowCardRack">
			UPDATE pp.flow_card
			SET rack = #{rackValue}
			@@ -1535,8 +1563,15 @@
			p.avg_cut_pct = #{optimalResults.avgCutRate},
			p.valid_cut_pct = #{optimalResults.validCutRate},
			p.last_cut_pct = #{optimalResults.lastCutRate},
			p.raw_stock_qty = #{optimalResults.totalQuantity}
			p.raw_stock_qty = #{optimalResults.totalQuantity},
			p.raw_stock_area = #{totalArea}
			where p.project_no = #{projectId}
			</update>
			<update id="updateProjectTemperingId">
			UPDATE pp.optimize_detail
			SET heat_layout_id = NULL,
			heat_layout_sort = NULL
			WHERE project_no = #{projectNumber}
			</update>

			<select id="simulatedTypesettingUsingOpt">
			@@ -1773,7 +1808,8 @@
			ol.realwidth as rawGlassWidth,
			ol.realheight as rawGlassHeight,
			op.glass_thickness as rawGlassThickness,
			ol.stock_id rawSequence
			ol.stock_id as rawSequence,
			ol.usage_rate as usageRate
			from
			pp.optimize_layout ol
			left join pp.optimize_project op on ol.project_no = op.project_no
			@@ -1785,6 +1821,7 @@


			<select id="selectOptimizeDetail">

			select
			opd.glass_id as glassId,
			opd.project_no as engineerId,
			@@ -1817,7 +1854,8 @@
			opd.mark_icon as markIcon,
			fc.`merge` as combine,
			concat( opd.process_id, '/', opd.layer ) as flowCardSequence,
			ogd.process
			ogd.process,
			if(opd.graph_no=100,0,1) as graphNo
			from
			pp.optimize_detail opd
			left join pp.optimize_project op on op.project_no = opd.project_no
			@@ -1897,8 +1935,8 @@
			<select id="getOptimizeDetailsInfo" resultType="java.util.Map">
			SELECT
			0 AS isRemain,
			od.width AS realWidth,
			od.height AS realHeight,
			od.o_width AS realWidth,
			od.o_height AS realHeight,
			od.p_width AS width,
			od.p_height AS height,
			od.process_id AS processId,
			@@ -1907,6 +1945,7 @@
			od.order_sort AS orderSort,
			od.stock_id AS layoutId,
			od.stock_number AS glassSort,
			od.polys_id AS polySort,
			od.x_axis AS x,
			od.y_axis AS y,
			od.mark_icon AS markIcon,
			@@ -1919,7 +1958,7 @@
			o.project AS projectName,
			ord.product_name AS productName,
			ord.building_number AS buildingNumber,
			COALESCE(h.layout_id, 0) as heatLayoutId,
			# COALESCE(h.layout_id, 0) as heatLayoutId,
			od.rack_no AS rackNo
			FROM
			pp.optimize_detail od
			@@ -1927,7 +1966,7 @@
			LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number AND ogd.technology_number = fc.technology_number)
			LEFT JOIN sd.ORDER o ON o.order_id = fc.order_id
			LEFT JOIN sd.order_detail ord ON (fc.order_id = ord.order_id and od.order_sort = ord.order_number)
			LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
			# LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
			WHERE
			od.project_no = #{projectId}
			</select>
			@@ -2063,6 +2102,37 @@
			WHERE
			project_no = #{processId}
			</select>
			<select id="selectConfigByUserAndType" resultType="java.lang.String">
			SELECT
			id,
			config_type,
			config_detail,
			creater
			FROM
			pp.optimize_config
			WHERE creater = #{username} AND config_type = #{type}
			</select>
			<select id="getGlassProjectList" resultType="java.util.Map" parameterType="java.lang.String">
			SELECT
			project_no AS projectId,
			tempering_state
			FROM
			pp.optimize_project
			WHERE
			project_no = #{projectId}
			</select>
			<select id="getProjectState" resultType="java.util.Map" parameterType="java.lang.String">
			SELECT
			project_no,
			project_name,
			state,
			tempering_state,
			optimize_state
			FROM
			pp.optimize_project
			WHERE
			project_no = #{projectNo}
			</select>


			</mapper>