ERP_override.git

			@@ -118,7 +118,7 @@
			and fol.type regexp #{finishedOperateLog.type}
			</if>
			<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
			and fol.remarks regexp #{finishedOperateLog.remarksr}
			and fol.remarks regexp #{finishedOperateLog.remarks}
			</if>
			<if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
			and fol.area regexp #{finishedOperateLog.area}
			@@ -192,7 +192,7 @@
			and fol.type regexp #{finishedOperateLog.type}
			</if>
			<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
			and fol.remarks regexp #{finishedOperateLog.remarksr}
			and fol.remarks regexp #{finishedOperateLog.remarks}
			</if>
			<if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
			and fol.area regexp #{finishedOperateLog.area}
			@@ -801,10 +801,11 @@
			and o.delivery_address regexp #{finishedOperateLog.order.deliveryAddress}
			</if>
			<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
			and fol.remarks regexp #{finishedOperateLog.remarksr}
			and fol.remarks regexp #{finishedOperateLog.remarks}
			</if>
			</where>
			group by fol.remarks,od.order_id,fol.process_id
			group by fol.remarks,od.order_id
			-- ,fol.process_id
			order by fol.operate_time desc
			limit #{offset},#{pageSize};
			</select>
			@@ -817,6 +818,7 @@
			from (select *
			from mm.finished_operate_log aa where aa.operate_type = '入库' and aa.status!='已作废') fol
			left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
			left join sd.`order` o on o.order_id=fol.order_id
			<where>
			date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
			and (fol.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)
			@@ -848,7 +850,7 @@
			and o.delivery_address regexp #{finishedOperateLog.order.deliveryAddress}
			</if>
			<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
			and fol.remarks regexp #{finishedOperateLog.remarksr}
			and fol.remarks regexp #{finishedOperateLog.remarks}
			</if>
			</where>
			group by fol.remarks,od.order_id,fol.process_id) as zu
			@@ -881,6 +883,7 @@
			select kkk.*,rw.teams_groups_name as teams_groups_name2 from(select o.order_id,
			o.customer_name,
			o.project,
			o.batch,
			fol.remarks,
			SUM(fol.quantity) as quantity,
			ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,
			@@ -933,11 +936,11 @@
			ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
			od.width,
			od.height,
			fol.quantity,
			sum(fol.quantity) as quantity,
			od.product_name,
			od.product_id,
			ROUND( od.width * od.height * fol.quantity / 1000000, 2 ) as area,
			ROUND( od.width * od.height * fol.quantity / 1000000, 2 )#{thickness}2.5 as weight
			ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,
			ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 )#{thickness}2.5 as weight
			FROM
			( SELECT * FROM mm.finished_operate_log aa WHERE aa.operate_type = '入库' AND aa.STATUS != '已作废' ) fol
			LEFT JOIN sd.order_detail od ON fol.order_id = od.order_id
			@@ -945,6 +948,7 @@
			LEFT JOIN sd.`order` o ON o.order_id = fol.order_id
			WHERE
			o.order_id=#{orderId} and fol.remarks=#{remarks} and od.product_id=#{productId}
			group by od.order_id,od.order_number
			ORDER BY
			fol.operate_time DESC