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 * from erp_user_info.`user` WHERE address=#{process}
			</select>

			<!-- 查询流程卡工艺流程-->
			@@ -189,56 +187,55 @@
			<!-- 非第一道工序报工明细查询-->
			<select id="SelectReworlDetailMp">
			SELECT
			fc.order_number,
			ogd.glass_child,
			ogd.technology_number,
			ogd.glass_address,
			fc.quantity AS quantity_card,
			ogd.child_width,
			ogd.child_height,
			fc.order_number,
			ogd.glass_child,
			ogd.technology_number,
			ogd.glass_address,
			fc.quantity AS quantity_card,
			ogd.child_width,
			ogd.child_height,
			if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
			if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
			0,
			if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
			0,
			odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
			if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
			0,
			if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
			0,
			odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as completedQuantity,
			odpd.reporting_work_num as completed,
			odpd.broken_num as onceBroken,
			ogd.`group`,
			if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
			od.other_columns,
			ogd.id as 'glassId'
			odpd.reporting_work_num as completed,
			odpd.broken_num as onceBroken,
			ogd.`group`,
			if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
			od.other_columns,
			ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state

			FROM
			sd.order_detail AS od
			sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			<if test="process == '夹胶'">
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			<if test="laminating == 'stepA' \|\| laminating == 'stepC'" >
			AND ogd.`group` = (select `group`
			from sd.order_glass_detail
			where order_id = ogd.order_id
			and order_number = ogd.order_number
			and POSITION(technology_number in #{technologyStr})
			limit 1)
			from sd.order_glass_detail
			where order_id = ogd.order_id
			and order_number = ogd.order_number
			and POSITION(technology_number in #{technologyStr})
			limit 1)
			</if>


			LEFT JOIN flow_card AS fc
			ON fc.order_id = ogd.order_id
			and fc.production_id=ogd.production_id
			AND fc.order_number = ogd.order_number
			AND fc.technology_number = ogd.technology_number
			ON fc.order_id = ogd.order_id
			and fc.production_id=ogd.production_id
			AND fc.order_number = ogd.order_number
			AND fc.technology_number = ogd.technology_number
			left join sd.order_process_detail as odpd
			ON odpd.order_id = fc.order_id
			AND odpd.order_number = fc.order_number
			AND odpd.technology_number = fc.technology_number
			and odpd.process_id = fc.process_id
			ON odpd.order_id = fc.order_id
			AND odpd.order_number = fc.order_number
			AND odpd.technology_number = fc.technology_number
			and odpd.process_id = fc.process_id
			left join sd.order_process_detail as odpds
			ON odpds.id = odpd.id-1
			ON odpds.id = odpd.id-1
			left join
			(SELECT
			(SELECT
			sum(rw.rework_num) as 'patchNumSum',
			rw.process_id,rw.order_sort,rw.technology_number,
			rwk.this_process
			@@ -248,19 +245,30 @@
			reporting_work as rwk
			on rw.reporting_work_id =rwk.reporting_work_id
			where rwk.this_process=#{process}
			and rw.review_status=1
			and rw.review_status>=0
			and rw.process_id = #{processIdStr}
			GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
			on c.process_id = fc.process_id
			and c.order_sort = fc.order_number
			and c.technology_number = fc.technology_number

			WHERE
			fc.process_id = #{processIdStr}
			<if test="laminating != 'laminating'">
			AND POSITION(fc.technology_number in #{technologyStr})
			on c.process_id = fc.process_id
			and c.order_sort = fc.order_number
			and c.technology_number = fc.technology_number
			left join (select reviewed_state as reviewed_state ,
			process_id,a.reporting_work_id,b.technology_number,b.order_number
			from reporting_work as a
			left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
			where this_process=#{previousProcess} and process_id= #{processIdStr} and a.reviewed_state>=0
			<if test="laminating == ''">
			AND POSITION(b.technology_number in #{technologyStr})
			</if>
			GROUP BY b.order_number,b.technology_number
			) as rws
			on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
			WHERE
			fc.process_id = #{processIdStr}

			AND odpd.process = #{process}
			<if test="laminating == ''">
			AND POSITION(fc.technology_number in #{technologyStr})
			</if>
			order by fc.order_number
			</select>

			@@ -511,7 +519,10 @@
			GROUP BY c.order_number,c.technology_number
			</select>
			<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
			select rw.reporting_work_id,
			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,
			(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,
			@@ -519,18 +530,18 @@
			o.batch,
			rw.this_process,
			rw.this_completed_quantity,
			round(ogd.child_widthogd.child_height rw.this_completed_quantity/1000000,2) as completedArea,
			rw.this_worn_quantity,
			round(ogd.child_widthogd.child_height rw.this_worn_quantity/1000000,2) as wornArea,
			rw.device_name,
			rw.teams_groups_name,
			rw.reviewed_state,
			rw.notes,
			rw.reviewed
			rw.reviewed,
			rwd.order_number,
			rwd.technology_number
			# (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
			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

			left join sd.`order` as o on o.order_id=rw.order_id
			where rw.reviewed_state != 2
			and rw.reporting_work_time >= #{selectTime1}
			@@ -564,7 +575,9 @@
			</if>
			GROUP BY rw.reporting_work_id
			ORDER BY rw.reporting_work_id desc
			limit #{offset},#{pageSize};
			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
			</select>

			<select id="getPageTotal">
			@@ -942,7 +955,7 @@
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			<if test="process == '夹胶' or (process == '打胶和粘框')">
			<if test="laminating == 'stepA' \|\| laminating == 'stepC'" >
			AND ogd.`group` = (select `group`
			from sd.order_glass_detail
			where order_id = ogd.order_id
			@@ -992,7 +1005,7 @@
			on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
			WHERE
			fc.process_id = #{processIdStr}
			<if test="laminating != 'laminating' ">
			<if test="laminating == ''">
			AND POSITION(fc.technology_number in #{technologyStr})
			</if>
			AND odpd.process = #{process}
			@@ -1010,27 +1023,24 @@

			<select id="getFootSum">
			SELECT
			ifnull(SUM(this_completed_quantity),0) AS thisCompletedQuantity,
			ifnull(SUM(ROUND(child_width * child_height * this_completed_quantity / 1000000, 2)),0) AS completedArea,
			ifnull(SUM(this_worn_quantity),0) AS thisWornQuantity,
			ifnull(SUM(ROUND(child_width * child_height * this_worn_quantity / 1000000, 2)),0) AS wornArea
			FROM (
			-- 先对 reporting_work_id 进行去重
			SELECT
			rw.reporting_work_id,
			MAX(rw.this_completed_quantity) AS this_completed_quantity,
			MAX(rw.this_worn_quantity) AS this_worn_quantity,
			MAX(ogd.child_width) AS child_width,
			MAX(ogd.child_height) AS child_height
			FROM reporting_work as rw left join reporting_work_detail 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
			left join sd.`order` as o on o.order_id=rw.order_id
			WHERE rw.reviewed_state != 2
			and rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			and position(#{orderId} in rw.order_id)
			AND rw.reviewed_state != -1
			AND o.create_order > 0
			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,
			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 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*/
			LEFT JOIN sd.`order` AS o ON o.order_id = rw.order_id
			WHERE rw.reviewed_state != 2
			and rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			AND position(#{orderId} in rw.order_id)
			AND rw.reviewed_state != -1
			AND o.create_order > 0
			<if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
			and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
			</if>
			@@ -1055,9 +1065,37 @@
			<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
			and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
			</if>
			GROUP BY rw.reporting_work_id -- 按 reporting_work_id 进行分组，确保唯一
			</select>

			) AS subquery;
			<select id="selectReviewedState">
			select reviewed_state from pp.reporting_work where reporting_work_id=#{reportingWorkId};
			</select>

			<select id="qualityReviewSearchMp" resultMap="reportingWorkMap">
			select rw.reporting_work_id,
			rw.reporting_work_time,
			rw.process_id,
			o.project,
			o.customer_name,
			rw.this_process,
			ifnull(rw.this_completed_quantity,0) as this_completed_quantity,
			rw.this_worn_quantity,
			rw.teams_groups_name,
			rw.device_name,
			rw.previous_process,
			rw.next_process,
			rw.quality_inspector,
			rw.quality_ins_time,
			dd.quality_ins_status
			from sd.order as o
			left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
			left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id

			right join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
			where rw.reviewed_state != 2
			and dd.quality_ins_status = 1
			and rw.reviewed_state!=-1
			GROUP BY rw.reporting_work_id
			ORDER BY rw.reporting_work_id desc
			</select>
			</mapper>