ERP_override.git

			@@ -107,8 +107,8 @@
			<if test="flowCard.orderId != null and flowCard.orderId != ''">
			and a.order_id regexp #{flowCard.orderId}
			</if>
			<if test="flowCard.productionId != null and flowCard.productionId != ''">
			and a.process_Id regexp #{flowCard.productionId}
			<if test="flowCard.processId != null and flowCard.processId != ''">
			and a.process_Id regexp #{flowCard.processId}
			</if>
			<if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
			and c.product_id regexp #{flowCard.orderDetail.productId}
			@@ -119,6 +119,15 @@

			<if test="flowCard.order.project != null and flowCard.order.project!= ''">
			and b.project regexp #{flowCard.order.project}
			</if>
			<if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '不可排版'">
			and a.layout_status regexp 0
			</if>
			<if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '可排版'">
			and a.layout_status regexp 1
			</if>
			<if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '已排版'">
			and a.layout_status regexp 2
			</if>

			ORDER BY a.id desc
			@@ -415,6 +424,7 @@
			select * from sd.order where create_time between #{selectTime1} and #{selectTime2} and
			position(#{orderId} in order_id ) and position(#{project} in project)
			and processing_card=2
			order by create_time desc
			</select>

			<select id="selectPrintMp">
			@@ -425,8 +435,8 @@
			o.project,
			ogd.technology_number,
			ogd.glass_address,
			od.quantity,
			ogd.total_area,
			sum(od.quantity) as quantity,
			sum(ogd.total_area) as total_area,
			od.product_name,
			ogd.glass_child,
			fc.founder,
			@@ -506,4 +516,32 @@
			set fc.layout_status=1
			where fc.process_id = #{processId}
			</update>

			<select id="getPrintLabel">
			select c.customer_name,
			c.order_id,
			e.type_name,
			b.remarks,
			c.project,
			a.child_width,
			a.child_height,
			sum(b.quantity) as quantity,
			a.glass_child,
			b.processing_note
			from sd.order_glass_detail as a
			left join sd.order_detail as b
			on a.order_id = b.order_id
			and a.order_number = b.order_number
			left join sd.`order` as c
			on c.order_id = a.order_id
			left join flow_card as d
			on d.order_id = a.order_id and d.order_number = a.order_number and
			d.technology_number = a.technology_number
			left join sd.basic_glass_type e
			on e.type_id = b.product_id
			where d.process_id = #{processId}
			and d.technology_number = #{technologyNumber}
			group by a.glass_child, a.child_width, a.child_height
			order by d.technology_number
			</select>
			</mapper>