ERP_override.git

			@@ -1251,10 +1251,10 @@
			order_sort,
			stock_id,
			polys_id,
			o_width,
			o_height,
			p_width,
			p_height,
			width,
			height,
			x_axis,
			y_axis,
			patch_state,
			@@ -1463,7 +1463,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>

			@@ -1920,8 +1920,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,
			@@ -2097,6 +2097,15 @@
			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>


			</mapper>