ERP_override.git

			@@ -27,6 +27,7 @@
			arch_rise,
			weight,
			perimeter,
			monolithic_perimeter,
			other_columns
			)
			values
			@@ -53,6 +54,7 @@
			#{orderDetail.archRise},
			#{orderDetail.weight},
			#{orderDetail.perimeter},
			#{orderDetail.monolithicPerimeter},
			#{orderDetail.otherColumns}
			)
			</foreach>
			@@ -63,7 +65,8 @@
			update order_detail as a
			set
			a.price = #{item.price},
			a.gross_amount = #{item.grossAmount}
			a.gross_amount = #{item.grossAmount},
			a.other_columns = #{item.otherColumns}
			where
			a.order_id = #{item.orderId} and
			a.order_number = #{item.orderNumber}
			@@ -117,7 +120,7 @@
			SELECT
			*
			from sd.`order` as b
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
			<if test="order.orderType != null and order.orderType != ''">
			and b.order_type like concat('%',#{order.orderType},'%')
			</if>
			@@ -187,7 +190,7 @@
			CEILING(count(b.id)/#{pageSize}) as 'pageTotal',
			count(b.id) as 'total'
			from sd.`order` as b
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
			<if test="order.orderType != null and order.orderType != ''">
			and b.order_type like concat('%',#{order.orderType},'%')
			</if>
			@@ -255,7 +258,7 @@
			<select id="exportOrderSummary" >
			SELECT *
			from sd.`order` as b
			where date(b.create_time)>=#{dates[0]} and date(b.create_time) <= #{dates[1]}
			where date(b.create_time)>=#{dates[0]} and date(b.create_time) <= #{dates[1]} and b.order_review>0
			order by b.id desc
			</select>

			@@ -275,7 +278,7 @@
			on d.type_id = c.type_id
			left join sd.basic_glass_type as e
			on e.type_id = d.belong
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0

			<if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
			and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
			@@ -418,7 +421,7 @@
			on d.type_id = c.type_id
			left join sd.basic_glass_type as e
			on e.type_id = d.belong
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
			<if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
			and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
			</if>
			@@ -562,7 +565,7 @@
			on d.type_id = c.type_id
			left join sd.basic_glass_type as e
			on e.type_id = d.belong
			where date(a.create_time)>=#{dates[0]} and date(a.create_time) <= #{dates[1]}
			where date(a.create_time)>=#{dates[0]} and date(a.create_time) <= #{dates[1]} and b.order_review>0
			</select>


			@@ -609,7 +612,7 @@
			on d.type_id = c.type_id
			left join sd.basic_glass_type as e
			on e.type_id = d.belong
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0

			<if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
			and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
			@@ -759,7 +762,7 @@
			on d.type_id = c.type_id
			left join sd.basic_glass_type as e
			on e.type_id = d.belong
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
			where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
			<if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
			and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
			</if>
			@@ -975,7 +978,7 @@
			left join sd.basic_glass_type as e
			on e.type_id = d.belong
			where date(b.create_time) >= #{dates[0]}
			and date(b.create_time) <= #{dates[1]}
			and date(b.create_time) <= #{dates[1]} and b.order_review>0
			group by b.order_id, a.product_id
			order by b.order_id desc
			</select>
			@@ -1002,8 +1005,9 @@

			(a.product_id) as 'productId',
			a.product_name as 'productName',
			p.remarks as 'remarks',
			a.order_number as 'orderNumber'
			from order_detail as a
			from order_detail as a left join sd.product p on a.product_id=p.id
			where a.order_id = #{orderId}
			group by a.product_id
			</select>
			@@ -1013,8 +1017,9 @@

			(a.product_id) as 'productId',
			a.product_name as 'productName',
			p.remarks as 'remarks',
			a.order_number as 'orderNumber'
			from order_detail as a
			from sd.order_detail as a left join sd.product p on a.product_id=p.id
			where a.order_id = #{orderId} and a.product_id IN
			<foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
			#{item}