ERP_override.git

			@@ -129,6 +129,7 @@
			from order_process_detail as a
			left join `order` as b on a.order_id=b.order_id
			where b.create_time BETWEEN #{selectTime1} and #{selectTime2}
			and position(#{orderId} in b.order_id)
			group by process

			</select>
			@@ -144,11 +145,12 @@
			left join sd.`order` o2 on c.order_id = o2.order_id,
			(SELECT @i:=-1) as d
			where o2.create_time BETWEEN #{selectTime1} and #{selectTime2}
			and position(#{orderId} in o2.order_id)
			GROUP BY order_number
			) as b
			on b.order_number = a.order_number
			left join sd.`order` o on a.order_id = o.order_id
			where o.create_time BETWEEN #{selectTime1} and #{selectTime2}
			where o.create_time BETWEEN #{selectTime1} and #{selectTime2} and position(#{orderId} in o.order_id)
			group by a.order_number
			</select>