ERP_override.git

			@@ -108,6 +108,7 @@
			<result column="creator" property="order.creator"/>
			<result column="verifier" property="order.verifier"/>
			<result column="customer_batch" property="order.customerBatch"/>
			<result column="other_money" property="order.otherMoney"/>

			</resultMap>

			@@ -428,6 +429,7 @@
			b.batch,
			a.product_id,
			a.product_name,
			b.other_money,
			sum(a.quantity) as quantity,
			sum(a.gross_area) as gross_area,
			sum(a.compute_gross_area) as compute_gross_area,
			@@ -586,6 +588,10 @@
			<if test="orderDetail.order!=null and orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
			and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
			</if>

			<if test="orderDetail.order!=null and orderDetail.order.otherMoney != null ">
			and b.other_money regexp REGEXP_REPLACE(#{orderDetail.order.otherMoney},'\\.0+$','')
			</if>
			group by b.order_id,a.product_id
			order by b.order_id desc
			limit #{offset},#{pageSize}
			@@ -731,6 +737,10 @@
			<if test="orderDetail.order!=null and orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
			and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
			</if>

			<if test="orderDetail.order!=null and orderDetail.order.otherMoney != null ">
			and b.other_money regexp REGEXP_REPLACE(#{orderDetail.order.otherMoney},'\\.0+$','')
			</if>
			group by b.order_id,a.product_id
			) as ss
			</select>
			@@ -744,9 +754,7 @@
			a.product_name,
			a.price,
			sum(a.quantity) as quantity,
			a.gross_amount,
			a.width,
			a.height,
			sum(a.gross_amount) as gross_amount,
			a.shape,
			sum(a.area) as area,
			sum(a.gross_area) as gross_area,
			@@ -818,8 +826,8 @@
			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(b.create_time) >= #{dates[0]}
			and date(b.create_time) <= #{dates[1]}
			group by b.order_id, a.product_id
			order by b.order_id desc
			</select>