ERP_override.git

			@@ -110,15 +110,15 @@

			<select id="addWordOrder" >
			select od.order_id,
			od.product_id,
			od.product_name,
			od.quantity,
			od.compute_gross_area,
			od.perimeter
			from order_detail as od
			left join sd.order_glass_detail as ogd
			on od.order_id = ogd.order_id
			where od.order_id = #{orderId} and ISNULL(ogd.production_id)
			od.product_id,
			od.product_name,
			sum( od.quantity) as quantity,
			od.compute_gross_area,
			od.perimeter
			from sd.order_detail as od
			left join sd.order as o
			on od.order_id =o.order_id
			where od.order_id = #{orderId} and o.production_order!=2
			<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
			and od.order_id regexp #{orderDetail.orderId}
			</if>
			@@ -132,8 +132,8 @@
			;
			</select>

			<select id="SelectOrderNumber" resultMap="wordOrderMap">
			select count(ogd.production_id)
			<select id="SelectOrderNumber" >
			select ifnull(count(ogd.production_id),0)
			from sd.order_glass_detail as ogd
			where ogd.production_id = #{productIdVl}
			</select>
			@@ -151,6 +151,7 @@
			and od.product_name = #{productName}
			</update>

			<!-- 删除工单-->
			<update id="DeleteOrderWorkMp">
			update sd.order_detail as od left join sd.order_glass_detail as ogd
			on od.order_id = ogd.order_id and od.order_number = ogd.order_number