ERP_override.git

			@@ -106,11 +106,11 @@

			<!-- 查询流程卡工艺流程-->
			<select id="SelectTechnologicalProcess">
			select ogd.process
			from sd.order_glass_detail as ogd
			where ogd.production_id = LEFT(#{processIdStr}, 11)
			and ogd.technology_number=#{technologyStr}
			limit 1
			select ifnull((select ogd.process
			from sd.order_glass_detail as ogd
			where ogd.production_id = LEFT(#{processIdStr}, 11)
			and ogd.technology_number=#{technologyStr}
			limit 1),'') as process

			</select>

			@@ -206,7 +206,7 @@
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			<if test="process == '夹胶'">
			<if test="process == '夹胶' or (process == '打胶和粘框' and previousProcess=='夹胶')">
			AND ogd.`group` = (select `group`
			from sd.order_glass_detail
			where order_id = ogd.order_id
			@@ -248,7 +248,7 @@

			WHERE
			fc.process_id = #{processIdStr}
			<if test="process != '中空' and process != '夹胶' and process != '包装'">
			<if test="process != '中空' and process != '夹胶' and process != '包装' and process != '打胶和粘框' ">
			AND fc.technology_number = #{technologyStr}
			</if>
			AND odpd.process = #{process}
			@@ -501,7 +501,7 @@
			select rw.reporting_work_id,
			(rw.reporting_work_time) as reporting_work_time,
			o.order_id,
			rw.process_id,
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct rwd.technology_number SEPARATOR '')) as process_id,
			o.project,
			o.batch,
			rw.this_process,