ERP_override.git

			@@ -37,6 +37,7 @@
			<association property="flowCard" javaType="com.example.erp.entity.pp.FlowCard">
			<result property="orderId" column="order_id"/>
			<result property="productionId" column="production_id"/>
			<result property="processId" column="processIdFirst"/>
			</association>
			<association property="reportingWorkDetail" javaType="com.example.erp.entity.pp.ReportingWorkDetail">
			<result property="completedQuantity" column="completed_quantity"/>
			@@ -69,6 +70,7 @@
			<select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
			select o.order_id,
			fc.production_id,
			fc.process_id as 'processIdFirst',
			o.customer_id,
			o.customer_name,
			o.project,
			@@ -490,7 +492,7 @@
			from reporting_work as rw
			left join reporting_work_detail as rwd
			on rw.reporting_work_id = rwd.reporting_work_id
			where rw.reviewed_state>-1
			where rw.reviewed_state>-1 and rw.order_id=#{orderId}
			group by rw.process_id,
			rw.this_process,
			rwd.order_number,
			@@ -509,7 +511,7 @@
			from reporting_work as rw
			left join reporting_work_detail as rwd
			on rw.reporting_work_id = rwd.reporting_work_id
			where rw.reviewed_state>=0
			where rw.reviewed_state>=0 and rw.order_id=#{orderId}
			group by rw.process_id,
			rw.this_process,
			rwd.order_number,
			@@ -543,11 +545,11 @@
			rwd.wornArea
			# (IF(rw.reviewed_state = 0, '未审核', IF(rw.reviewed_state = 1, '审核通过', '审核不通过'))) as reviewed_state
			from
			reporting_work as rw
			pp.reporting_work as rw
			left join (
			SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2) as completedArea ,round(sum(cc.wornArea),2) as wornArea from (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,
			sum(rwds.child_widthrwds.child_heightcompleted_quantity/1000000)as completedArea,
			sum(rwds.child_widthrwds.child_heightrwds.breakage_quantity/1000000) as wornArea from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)as rwd on rw.reporting_work_id=rwd.reporting_work_id
			sum(rwds.child_widthrwds.child_heightrwds.breakage_quantity/1000000) as wornArea from pp.reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)as rwd on rw.reporting_work_id=rwd.reporting_work_id

			left join sd.`order` as o on o.order_id=rw.order_id
			where rw.reviewed_state != 2
			@@ -579,7 +581,7 @@
			and rw.device_name regexp #{reportingWork.deviceName}
			</if>
			<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
			and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
			and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')
			</if>
			GROUP BY rw.reporting_work_id
			ORDER BY rw.reporting_work_id desc
			@@ -1040,11 +1042,11 @@
			ROUND(SUM(rwd.wornArea), 2) AS wornArea,
			CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
			count(distinct rw.reporting_work_id) as 'total'
			FROM reporting_work AS rw
			FROM pp.reporting_work AS rw
			LEFT JOIN
			(SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2) as completedArea ,round(sum(cc.wornArea),2) as wornArea from (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,
			sum(rwds.child_widthrwds.child_heightcompleted_quantity/1000000)as completedArea,
			sum(rwds.child_widthrwds.child_heightrwds.breakage_quantity/1000000) as wornArea from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)
			sum(rwds.child_widthrwds.child_heightrwds.breakage_quantity/1000000) as wornArea from pp.reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)
			AS rwd
			ON rw.reporting_work_id = rwd.reporting_work_id
			/*LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = rw.order_id
			@@ -1064,7 +1066,7 @@
			and o.order_id regexp #{reportingWork.orderId}
			</if>
			<if test="reportingWork.processId != null and reportingWork.processId != ''">
			and rw.process_id regexp #{reportingWork.processId}
			and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')
			</if>
			<if test="reportingWork.order.project != null and reportingWork.order.project != ''">
			and o.project regexp #{reportingWork.order.project}
			@@ -1079,7 +1081,7 @@
			and rw.device_name regexp #{reportingWork.deviceName}
			</if>
			<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
			and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
			and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')
			</if>
			</select>

			@@ -1118,10 +1120,10 @@
			<select id="mesSelectWorkBasicDeviceMp">
			SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
			on bd.id=bdp.basic_category
			where bd.basic_category="process" and bdp.basic_type="device" and bd.basic_name = #{process}
			where bd.basic_category="process" and bdp.basic_type="device"
			</select>

			<select id="mesSelectWorkBasicTeamsMp">
			select id,login_name,user_name,address from erp_user_info.`user`
			select id,login_name,user_name,address from erp_user_info.`user` where address is not null
			</select>
			</mapper>