ERP_override.git

			@@ -582,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>
			@@ -795,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>

			@@ -1560,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">
			@@ -1810,6 +1820,7 @@


			<select id="selectOptimizeDetail">

			select
			opd.glass_id as glassId,
			opd.project_no as engineerId,