ERP_override.git

			@@ -517,9 +517,9 @@
			o.batch,
			rw.this_process,
			rw.this_completed_quantity,
			round(ogd.area * rw.this_completed_quantity,2) as completedArea,
			round(ogd.child_widthogd.child_height rw.this_completed_quantity/1000000,2) as completedArea,
			rw.this_worn_quantity,
			round(ogd.area * rw.this_worn_quantity,2) as wornArea,
			round(ogd.child_widthogd.child_height rw.this_worn_quantity/1000000,2) as wornArea,
			rw.device_name,
			rw.teams_groups_name,
			rw.reviewed_state,
			@@ -886,4 +886,32 @@
			where reporting_work_id=#{reportingWorkId} and order_number = #{orderSort}
			and technology_number = #{technologyNumber}
			</update>

			<select id="selectUserProcess">
			select address from erp_user_info.user where login_name=#{userId}
			</select>

			<select id="getSelectProcessJiajiao">
			SELECT * FROM (
			SELECT * FROM sd.basic_data
			WHERE basic_type='product' AND basic_category='process' AND basic_name='夹胶'

			UNION

			SELECT * FROM sd.basic_data
			WHERE basic_type='product' AND basic_category='process' AND basic_name='均质'
			) AS combined_results;
			</select>

			<select id="getSelectProcessDuoqu">
			SELECT * FROM (
			SELECT * FROM sd.basic_data
			WHERE basic_type='product' AND basic_category='process' AND basic_name='技术部多曲'

			UNION

			SELECT * FROM sd.basic_data
			WHERE basic_type='product' AND basic_category='process' AND basic_name='钢化'
			) AS combined_results;
			</select>
			</mapper>