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}
			@@ -143,6 +143,7 @@
			from (select *
			from mm.finished_operate_log aa where aa.operate_type = #{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}
			<if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
			@@ -191,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}
			@@ -800,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>
			@@ -816,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)
			@@ -847,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
			@@ -874,34 +877,38 @@
			</select>

			<select id="getPrimaryListLimts">



			select kkk.*,rw.teams_groups_name as teams_groups_name2 from(select o.order_id,
			o.customer_name,
			o.project,
			fol.remarks,
			SUM(fol.quantity) as quantity,
			ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,
			ROUND( sum(od.width * od.height * fol.quantityp.total_thickness2.5) / 1000000, 2 ) as weight,
			fol.process_id,
			aaa.teams_groups_name,
			aaa.previous_process,
			date( aaa.reporting_work_time) as reporting_work_time
			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
			left join sd.product p on od.product_id=p.id
			left join (select teams_groups_name,process_id,previous_process,reporting_work_time from pp.reporting_work where this_process='包装') aaa on aaa.process_id=fol.process_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,
			ROUND( sum(od.width * od.height * fol.quantityp.total_thickness2.5) / 1000000, 2 ) as weight,
			fol.process_id,
			aaa.teams_groups_name,
			aaa.previous_process,
			date( aaa.reporting_work_time) as reporting_work_time
			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
			left join sd.product p on od.product_id=p.id
			left join (select teams_groups_name,process_id,previous_process,reporting_work_time from pp.reporting_work where this_process='包装' group by process_id) aaa on aaa.process_id=fol.process_id



			where
			o.order_id=#{orderId} and fol.remarks=#{remarks}
			and (fol.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)
			where
			o.customer_name=#{customerName} and fol.remarks=#{remarks} and o.project=#{project}
			and (fol.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)

			group by fol.remarks,od.order_id
			) as kkk
			left join pp.reporting_work rw on rw.process_id=kkk.process_id and rw.this_process=kkk.previous_process
			group by kkk.remarks,kkk.order_id
			group by fol.remarks,o.customer_name,o.project
			) as kkk
			left join pp.reporting_work rw on rw.process_id=kkk.process_id and rw.this_process=kkk.previous_process
			group by kkk.remarks,kkk.customer_name,kkk.project

			</select>

			@@ -926,7 +933,7 @@

			<select id="getDetailLists">
			SELECT
			od.building_number,
			ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
			od.width,
			od.height,
			fol.quantity,