ERP_override.git

			@@ -102,9 +102,7 @@
			</select>

			<select id="SelectWorkBasicTeamsMp">
			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="teamsgroups" and bd.basic_name = #{process}
			select id,login_name,user_name,address from erp_user_info.`user` WHERE address=#{process}
			</select>

			<!-- 查询流程卡工艺流程-->
			@@ -300,15 +298,13 @@

			<select id="historyTeamsMp">
			SELECT
			bdp.id,
			bdp.basic_type,
			bd.id,
			bd.basic_type,
			rw.teams as basic_name,
			bd.basic_name,bd.id AS basic_category,
			rw.process
			FROM
			sd.basic_data AS bd
			LEFT JOIN `basic_data_produce` AS bdp
			ON bd.id = bdp.basic_category
			right join (
			select distinct process,teams from
			( select distinct rw.this_process as process,rw.teams_groups_name as teams
			@@ -317,8 +313,6 @@
			) as t
			) as rw
			on rw.process=bd.basic_name
			WHERE
			bdp.basic_type = 'teamsgroups'
			GROUP BY rw.process,rw.teams
			</select>

			@@ -328,10 +322,9 @@
			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 = 'teamsgroups'
			AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
			</select>

			@@ -444,7 +437,7 @@
			-ifnull(g.completed_quantity,0))
			>
			a.completed_quantity,
			0,
			a.completed_quantity,
			(f.completed_quantity
			-ifnull(g.completed_quantity,0))
			) as minQuantity -- 修改最小数
			@@ -521,13 +514,10 @@
			GROUP BY c.order_number,c.technology_number
			</select>
			<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
			SELECT a.*,
			round(ogd.child_widthogd.child_height a.this_completed_quantity/1000000,2) as completedArea,
			round(ogd.child_widthogd.child_height a.this_worn_quantity/1000000,2) as wornArea
			from (select rw.reporting_work_id,
			select rw.reporting_work_id,
			(rw.reporting_work_time) as reporting_work_time,
			o.order_id,
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct rwd.technology_number SEPARATOR '')) as process_id,
			CONCAT(rw.process_id,'/',rwd.goup) as process_id,
			o.project,
			o.batch,
			rw.this_process,
			@@ -538,11 +528,15 @@
			rw.reviewed_state,
			rw.notes,
			rw.reviewed,
			rwd.order_number,
			rwd.technology_number
			round(rwd.completedArea/LENGTH(rwd.goup),2) as completedArea,
			rwd.wornArea
			# (IF(rw.reviewed_state = 0, '未审核', IF(rw.reviewed_state = 1, '审核通过', '审核不通过'))) as reviewed_state
			from
			reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
			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

			left join sd.`order` as o on o.order_id=rw.order_id
			where rw.reviewed_state != 2
			@@ -577,9 +571,7 @@
			</if>
			GROUP BY rw.reporting_work_id
			ORDER BY rw.reporting_work_id desc
			limit #{offset},#{pageSize} ) as a
			left join sd.order_glass_detail as ogd on ogd.order_id=a.order_id and ogd.order_number=a.order_number and ogd.technology_number=a.technology_number
			GROUP BY a.reporting_work_id
			limit #{offset},#{pageSize}
			</select>

			<select id="getPageTotal">
			@@ -1025,14 +1017,19 @@

			<select id="getFootSum">
			SELECT
			SUM(rwd.completed_quantity) AS thisCompletedQuantity,
			ROUND(SUM(rwd.child_width * rwd.child_height * rwd.completed_quantity / 1000000), 2) AS completedArea,
			SUM(rwd.breakage_quantity) AS thisWornQuantity,
			ROUND(SUM(rwd.child_width * rwd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea,
			SUM(rw.this_completed_quantity) AS thisCompletedQuantity,
			ROUND(SUM(rwd.completedArea/length(goup)), 2) AS completedArea,
			SUM(rw.this_worn_quantity) AS thisWornQuantity,
			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
			LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
			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
			/*LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = rw.order_id
			AND ogd.order_number = rwd.order_number
			AND ogd.technology_number = rwd.technology_number*/