ERP_override.git

			@@ -450,7 +450,7 @@
			</delete>

			<select id="selectPrintFlowCardMp">
			select *
			select order_id,project,customer_name,quantity,area,order_type,pack_type,batch
			from sd.order
			where create_time between #{selectTime1} and #{selectTime2}
			and position(#{orderId} in order_id)
			@@ -901,4 +901,37 @@
			<select id="selectorderOtherMoney">
			select * from sd.basic_other_money where (id=21 or id>31)
			</select>

			<select id="selectReworkPrintMp">
			select fc.id,
			fc.order_id,
			fc.process_id,
			o.customer_name,
			o.project,
			fc.order_number,
			ogd.technology_number,
			ogd.glass_address,
			pl.rework_num,
			pl.rework_area,
			pl.rework_team,
			pl.responsible_equipment,
			pl.responsible_personnel,
			pl.rework_type,
			pl.rework_reason,
			pl.rework_processes,
			od.product_name,
			ogd.glass_child
			from flow_card as fc
			left join sd.order_glass_detail as ogd
			on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
			ogd.technology_number = fc.technology_number
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.`order` as o on o.order_id = fc.order_id
			left join rework as pl on pl.order_id = fc.order_id and pl.process_id = fc.process_id and
			pl.order_sort = fc.order_number and
			pl.technology_number = fc.technology_number
			where pl.create_time between #{selectTime1} and #{selectTime2}
			GROUP BY fc.process_id, ogd.technology_number
			order by fc.process_id, ogd.technology_number
			</select>
			</mapper>