ERP_override.git

			@@ -255,7 +255,7 @@

			WHERE
			fc.process_id = #{processIdStr}
			<if test="process != '中空' and process != '夹胶' and process != '包装' and process != '打胶和粘框' ">
			<if test="laminating != 'laminating'">
			AND POSITION(fc.technology_number in #{technologyStr})
			</if>
			AND odpd.process = #{process}
			@@ -430,11 +430,11 @@
			ifnull(g.completed_quantity,0) as nextQuantitySum, -- 后工序已完成
			if((f.completed_quantity
			-ifnull(g.completed_quantity,0))
			>=
			>
			a.completed_quantity,
			0,
			(a.completed_quantity-f.completed_quantity
			+ifnull(g.completed_quantity,0))
			(f.completed_quantity
			-ifnull(g.completed_quantity,0))
			) as minQuantity -- 修改最小数
			</if>
			<if test="nextProcess == null or nextProcess == ''"> -- 最后一道工序
			@@ -987,17 +987,21 @@
			from reporting_work as a
			left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
			where this_process=#{previousProcess} and reviewed_state=0 and process_id= #{processIdStr}
			and POSITION(b.technology_number in #{technologyStr})

			GROUP BY a.reporting_work_id,b.order_number,b.technology_number
			) as rws
			on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
			WHERE
			fc.process_id = #{processIdStr}
			<if test="process != '中空' and process != '夹胶' and process != '包装' and process != '打胶和粘框' ">
			<if test="laminating != 'laminating' ">
			AND POSITION(fc.technology_number in #{technologyStr})
			</if>
			AND odpd.process = #{process}
			and rws.reviewed_state=0
			order by fc.order_number
			</select>

			<select id="getProcessLaminating">
			select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process}
			</select>
			</mapper>