ERP_override.git

			@@ -5,62 +5,123 @@
			<!--返工数据-->

			<mapper namespace="com.example.erp.mapper.pp.ReworkMapper">
			<resultMap id="reworkDataTitle" type="com.example.erp.entity.pp.Rework">


			</resultMap>


			<!--获取返工数据-->
			<select id="queryRework" resultMap="reworkDataTitle">
			select * from rework
			<!--<where>

			create_time <![CDATA[>=]]> #{startTime} and create_time <![CDATA[<=]]> #{endTime}}
			<!–返工编号–>
			<if test="rework_id!=null and rework != ''">
			and rework_id = #{reworkId}
			</if>
			<!–流程卡号–>
			<if test="process_id != null and process_id != ''">
			and process_id=#{processId}
			</if>
			<!–返工类型–>
			<if test="rework_Type != null and rework_Type!=''">
			and rework_Type=#{rework_Type}
			</if>
			<!–返工原因–>
			<if test="rework_Reason != null and rework_Reason!=''">
			and rework_Reason=#{rework_Reason}
			</if>
			<!–返工工序–>
			<if test="rework_Processes != null and rework_Processes!=''">
			and rework_Processes=#{rework_Processes}
			</if>
			<!–返工数量–>
			<if test="rework_Num != null and rework_Num!=''">
			and rework_Num=#{rework_Num}
			</if>
			<!–返工班组–>
			<if test="rework_Team != null and rework_Team!=''">
			and rework_Team=#{rework_Team}
			</if>
			<!–审核人–>
			<if test="reviewer != null and reviewer!=''">
			and reviewer=#{reviewer}
			</if>
			<!–审核状态–>
			<if test="review_Status != null and review_Status!=''">
			and review_Status=#{review_Status}
			</if>
			<!–返工面积–>
			<if test="rework_Area != null and rework_Area!=''">
			and rework_Area=#{rework_Area}
			</if>

			</where>-->

			<select id="SelectRework" >
			select
			r.review_status,
			r.rework_team,
			r.rework_id,
			r.process_id,
			r.order_id,
			r.order_sort,
			o.project,
			o.batch,
			od.product_name,
			ogd.technology_number,
			ogd.glass_address,
			r.rework_num,
			od.width,
			od.height,
			od.shape,
			r.rework_type,
			r.rework_reason,
			r.responsible_team,
			r.responsible_personnel,
			r.responsible_equipment,
			r.rework_area,
			r.quality_inspector,
			r.rework_processes,
			r.reviewer,
			date(r.create_time) as create_time,
			date(r.update_time) as update_time
			from pp.rework r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
			left join sd.`order` o on r.order_id = o.order_id
			left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
			on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
			<where>
			date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
			</where>
			order by r.review_status
			limit #{offset},#{pageSize};
			</select>

			<select id="SelectReworkPageTotal" >
			select CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
			count(zu.id) as 'total'
			from (select r.id as id
			from pp.rework r
			left join sd.order_detail od on r.order_id = od.order_id and r.order_sort = od.order_number
			left join sd.`order` o on r.order_id = o.order_id
			left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
			on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
			<where>
			date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
			</where>
			) as zu
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectRework">
			select o.order_id as orderId,
			rwd.reporting_work_id as reportingWorkId,
			rw.process_id as processId,
			o.project,
			o.batch,
			rwd.order_number as orderSort,
			od.product_name as productName,
			ogd.technology_number as technologyNumber,
			ogd.glass_address as glassAddress,
			rwd.wait_rework_quantity as reworkNum,
			od.width,
			od.height,
			od.shape,
			rwd.breakage_quantity as breakageQuantity,
			rwd.return_process as reworkProcesses,
			rwd.breakage_reason as reworkReason,
			rwd.breakage_type as reworkType,
			rwd.responsible_personnel as responsiblePersonnel,
			rwd.responsible_equipment as responsibleEquipment,
			rwd.responsible_team as responsibleTeam,
			ROUND(rwd.wait_rework_quantity * od.width * od.height / 1000000, 2) as reworkArea,
			rw.qualityIns_pector as qualityInsPector
			from pp.reporting_work_detail rwd
			left join pp.reporting_work rw on rwd.reporting_work_id = rw.reporting_work_id
			left join sd.`order` o on rw.order_id = o.order_id
			left join sd.order_detail od on rw.order_id = od.order_id and rwd.order_number = od.order_number
			left join sd.order_glass_detail ogd
			on rw.order_id = ogd.order_id and rwd.order_number = ogd.order_number
			where rwd.wait_rework_quantity>0

			group by ogd.order_id, ogd.order_number
			</select>


			<select id="getMaximum" >
			select count(*) from pp.rework where date(create_time)=CURDATE()
			</select>

			<insert id="insertRework" useGeneratedKeys="true" >
			insert into pp.rework(rework_id,reporting_work_id, process_id,order_id, order_sort, technology_number, responsible_team,
			responsible_personnel, rework_type, rework_reason, rework_processes, rework_num,
			rework_area, rework_team,responsible_equipment,quality_inspector, reviewer, review_status, create_time)
			values (
			#{oddNumber}, #{rework.reportingWorkId},#{rework.processId},#{rework.orderId},#{rework.orderSort},#{rework.technologyNumber},#{rework.responsibleTeam},
			#{rework.responsiblePersonnel},#{rework.reworkType},#{rework.reworkReason},#{rework.reworkProcesses},#{rework.reworkNum},
			#{rework.reworkArea},#{rework.reworkTeam},#{rework.responsibleEquipment},#{rework.qualityInspector},"",0,now()
			)
			</insert>

			<update id="updateRework" >
			update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.reworkId}
			</update>

			<update id="updateReportingWorkDetail" >
			update pp.reporting_work_detail set wait_rework_quantity=wait_rework_quantity-#{rework.reworkNum}
			where reporting_work_id=#{rework.reportingWorkId} and order_number=#{rework.orderSort} and technology_number=#{rework.technologyNumber}
			</update>


			</mapper>