ERP_override.git

			@@ -58,6 +58,36 @@
			<result property="modifyTime" column="modify time"/>
			</resultMap>

			<!--工程信息-->
			<select id="projectInfoMp">
			SELECT
			f.order_number,
			g.child_width ,
			g.child_height ,
			f.quantity ,
			d.shape ,
			op.process_cards ,
			d.product_name ,
			op.remark ,
			d.building_number ,
			round(((`g`.`child_width` + g.child_height) * 2 * `f`.`quantity`),2) as perimeter ,
			round((`g`.`area` * `f`.`quantity`),4) AS area,
			f.technology_number ,
			g.glass_child ,
			g.icon
			FROM
			((pp.flow_card AS f
			LEFT JOIN sd.order_detail AS d ON (((f.order_id = d.order_id) AND (f.order_number = d.order_number))))
			LEFT JOIN sd.order_glass_detail AS g ON (((f.order_id = g.order_id) AND (f.order_number = g.order_number) AND (f.technology_number = g.technology_number))))
			INNER JOIN pp.optimize_project AS op ON op.project_no = f.project_no
			WHERE
			f.project_no = #{projectNo}
			GROUP BY
			f.order_id,
			f.technology_number,
			f.order_number;
			</select>

			<select id="selectWordOrder" resultMap="wordOrderMap">
			select
			o.order_id,
			@@ -133,6 +163,7 @@
			ORDER BY fc.process_id, fc.technology_number
			</select>

			<!--工程管理-->
			<select id="optimizeProjectMangeMp" resultMap="optimizeProjectMangeMap">
			select p.`id` AS `id`,
			p.`project_no` AS `Project Number`,