ERP_override.git

			@@ -767,11 +767,11 @@
			`p`.`frist_stock_qty` AS `Amount of original glass usage 1`,
			concat(`p`.`frist_cut_pct`, ' %') AS `Average cutting rate 1`,
			`p`.`remark` AS `Notes`,
			`a`.`name` AS `Creator`,
			`u`.`user_name` AS `Creator`,
			`p`.`create_time` AS `Create time`,
			`p`.`update_time` AS `Modify time`
			from pp.optimize_project as p
			left join pp.optimize_admin as a on p.creater = a.Id
			left join erp_user_info.user as u on p.creater = u.login_name
			where (`p`.`state` > 0)
			# and (tempering_state>0 or optimize_state>0)
			and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
			@@ -1108,14 +1108,14 @@

			<update id="updateProjectMp">
			update pp.optimize_project set project_name=#{projectNmae},glass_total=#{sumQuantity},glass_total_area= #{sumArea},
			type=#{type},process_qty=#{processIdCount},process_cards=#{processId} where project_no=#{projectId}
			type=#{type},process_qty=#{processIdCount},process_cards=#{processId},creater = #{userName} where project_no=#{projectId}
			</update>

			<insert id="addProjectMp">
			insert into pp.optimize_project (project_no, project_name, order_glass_type, order_glass_thickness,glass_type, glass_thickness,
			glass_total,glass_total_area,type,state,process_qty,process_cards)
			glass_total,glass_total_area,type,state,process_qty,process_cards,creater )
			values (#{projectId}, #{projectNmae}, #{glassType}, #{glassThickness}, #{glassType}, #{glassThickness},#{sumQuantity}, #{sumArea},
			#{type},1,#{processIdCount},#{processId})
			#{type},1,#{processIdCount},#{processId},#{userName})
			</insert>


			@@ -1528,6 +1528,15 @@
			WHERE
			project_no = #{processId} AND polys_id = #{detail.polySort}
			</update>
			<update id="updateProjectOptimize">
			update pp.optimize_project as p
			set p.optimize_state = #{states},
			p.avg_cut_pct = #{optimalResults.avgCutRate},
			p.valid_cut_pct = #{optimalResults.validCutRate},
			p.last_cut_pct = #{optimalResults.lastCutRate},
			p.raw_stock_qty = #{optimalResults.totalQuantity}
			where p.project_no = #{projectId}
			</update>

			<select id="simulatedTypesettingUsingOpt">
			SELECT