ERP_override.git

			@@ -424,6 +424,8 @@
			ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 本工序完工和
			if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
			e.other_columns,
			IF(count(pl.id)>0,'已补片','') as patchStatusOther,

			<if test="nextProcess != null and nextProcess != ''"> -- 非最后一道工序
			ifnull(g.completed_quantity,0) as nextQuantitySum, -- 后工序已完成
			if((f.completed_quantity
			@@ -463,6 +465,8 @@
			and d.technology_number = c.technology_number
			left join sd.order_detail as e
			on e.order_id = d.order_id and e.order_number = d.order_number
			left join patch_log as pl on pl.reporting_work_id=b.reporting_work_id
			and pl.order_sort=a.order_number and pl.technology_number=a.technology_number

			left join (select sum(completed_quantity) as completed_quantity ,
			rw.process_id,
			@@ -513,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,
			@@ -882,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>