ERP_override.git

			@@ -746,7 +746,7 @@
			from pp.optimize_project as p
			left join pp.optimize_admin as a on p.creater = a.Id
			where (`p`.`state` > 0)
			and (tempering_state>0 or optimize_state>0)
			# and (tempering_state>0 or optimize_state>0)
			and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
			<if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
			and p.project_no regexp #{optimizeProjectMange.projectNumber}
			@@ -1224,14 +1224,16 @@
			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,
			rack_no
			) VALUES (
			#{projectId},
			@@ -1249,6 +1251,8 @@
			#{glass.y},
			#{glass.patchState},
			#{glass.markIcon},
			#{glass.isRotate},
			#{glass.glassPoint},
			#{glass.rackNo}
			);
			</foreach>
			@@ -1279,12 +1283,15 @@
			stock_id,
			width,
			height,
			realwidth,
			realheight,
			usage_rate,
			stock_code,
			up_trim,
			down_trim,
			left_trim,
			right_trim,
			count,
			glass_count,
			glass_area,
			create_time
			@@ -1293,13 +1300,16 @@
			#{glass.stockId},
			#{glass.width},
			#{glass.height},
			#{glass.realWidth},
			#{glass.realHeight},
			#{glass.usageRate},
			#{glass.stockCode},
			#{glass.upTrim},
			#{glass.downTrim},
			#{glass.leftTrim},
			#{glass.rightTrim},
			#{glass.glassCount},
			#{glass.count},
			#{glass.glassQuantity},
			#{glass.glassArea},
			now()
			);
			@@ -1341,6 +1351,48 @@
			now()
			);
			</foreach>
			</insert>
			<insert id="addOptimizeOffcut">
			INSERT INTO pp.optimize_offcut (
			project_no,
			stock_id,
			width,
			height,
			x_axis,
			y_axis,
			model,
			thickness
			) VALUES (
			#{projectId},
			#{map.stockSort},
			#{map.width},
			#{map.height},
			#{map.x},
			#{map.y},
			#{glassType},
			#{glassThickness}

			)
			</insert>
			<insert id="addUpdateOffcut">
			INSERT INTO pp.optimize_offcut (
			project_no,
			stock_id,
			width,
			height,
			x_axis,
			y_axis,
			model,
			thickness
			) VALUES (
			#{processId},
			1,
			#{detail.width},
			#{detail.height},
			#{detail.x},
			#{detail.y},
			#{glassType},
			#{glassThickness})
			</insert>


			@@ -1440,6 +1492,14 @@
			UPDATE pp.flow_card
			SET rack = #{rackValue}
			WHERE process_id = #{processId} AND technology_number = #{technologyNumber}
			</update>
			<update id="updateNormalDetails">
			UPDATE pp.optimize_detail
			SET
			x_axis = #{detail.x},
			y_axis = #{detail.y}
			WHERE
			project_no = #{processId} AND polys_id = #{detail.polySort}
			</update>

			<select id="simulatedTypesettingUsingOpt">
			@@ -1635,6 +1695,16 @@
			delete from pp.other_flow_card
			where project_no = #{projectNumber}
			</delete>
			<delete id="deleteOptimizeOffcut">
			DELETE
			FROM
			pp.optimize_offcut
			WHERE
			project_no = #{projectNumber}
			</delete>
			<delete id="deleteOffcutDetails">
			delete from pp.optimize_offcut where project_no = #{processId}
			</delete>


			<select id="selectOptimizeProject">
			@@ -1749,8 +1819,78 @@
			where
			project_no =#{projectNo}
			</select>


			<select id="getGlassInfo" resultType="java.util.Map">
			select
			project_no,
			glass_type,
			glass_thickness
			from
			pp.optimize_project
			where
			project_no = #{projectId}
			</select>
			<select id="getOptimizeLayoutsInfo" resultType="java.util.Map">
			SELECT
			width,
			height,
			realwidth,
			realheight,
			stock_id AS stockId,
			stock_code AS stockCode,
			usage_rate AS usageRate,
			up_trim AS upTrim,
			down_trim AS downTrim,
			left_trim AS leftTrim,
			right_trim AS rightTrim,
			count AS quantity,
			glass_count AS glassQuantity
			FROM
			pp.optimize_layout
			where
			project_no = #{projectId}
			</select>
			<select id="getOptimizeDetailsInfo" resultType="java.util.Map">
			SELECT
			0 As isRemain,
			width AS realWidth,
			height AS realHeight,
			p_width AS width,
			p_height AS height,
			process_id AS processId,
			layer,
			total_layer AS totalLayer,
			order_sort As orderSort,
			stock_id AS layoutId,
			stock_number AS glassSort,
			x_axis AS x,
			y_axis AS y,
			mark_icon AS markIcon,
			isRotate,
			glass_point AS glassPoint,
			rack_no As rackNo
			FROM
			pp.optimize_detail
			WHERE
			project_no = #{projectId}
			</select>
			<select id="getOptimizeOffsetsInfo" resultType="java.util.Map">
			SELECT
			1 AS isRemain,
			0 AS isRotate,
			width AS realWidth,
			height AS realHeight,
			width AS width,
			height AS height,
			stock_id AS stockSort,
			x_axis AS x,
			y_axis AS y,
			model AS glassType,
			thickness AS glassThickness
			FROM
			pp.optimize_offcut
			WHERE
			project_no = #{projectId}
			</select>


			</mapper>