ERP_override.git

			@@ -16,7 +16,6 @@
			<result property="thisWornQuantity" column="this_worn_quantity"/>
			<result property="deviceName" column="device_name"/>
			<result property="teamsGroupsName" column="teams_groups_name"/>
			<result property="reviewedState" column="reviewed_state"/>
			<result property="reportingWorkId" column="reporting_work_id"/>
			<result property="processId" column="process_id"/>
			<result property="completedArea" column="completedArea"/>
			@@ -24,6 +23,7 @@
			<result property="qualityInspector" column="quality_inspector"/>
			<result property="qualityInsTime" column="quality_ins_time"/>
			<result property="notes" column="notes"/>
			<result property="reviewed" column="reviewed"/>

			<association property="order" javaType="com.example.erp.entity.sd.Order">
			<result property="customerId" column="customer_id"/>
			@@ -518,7 +518,8 @@
			rw.device_name,
			rw.teams_groups_name,
			rw.reviewed_state,
			rw.notes
			rw.notes,
			rw.reviewed
			# (IF(rw.reviewed_state = 0, '未审核', IF(rw.reviewed_state = 1, '审核通过', '审核不通过'))) as reviewed_state
			from sd.order as o
			left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
			@@ -802,7 +803,7 @@
			<update id="ReviewReportingWorkMp">
			update reporting_work as rw
			left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
			set rw.reviewed_state = 1
			set rw.reviewed_state = 1 ,rw.reviewed=#{userName}
			where rw.process_id = #{substring} and rw.this_process=#{process}
			and POSITION(rwd.technology_number in #{result}) and reviewed_state=0
			</update>
			@@ -810,4 +811,51 @@
			<select id="getPatchConditionMp">
			select count(*) from damage_details where reporting_work_id=#{reportingWorkId} and patch_status>0
			</select>

			<select id="getFirstStep">
			SELECT

			fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as quantity
			FROM
			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
			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
			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
			left join (
			select ifnull(sum(a.patch_num),0) as patch_num,a.process_id,a.technology_number,a.order_sort
			from patch_log as a
			right join reporting_work
			on a.reporting_work_id=reporting_work.reporting_work_id
			where
			reporting_work.this_process = #{interceptProcess}
			and a.process_id=#{processId}
			and a.order_sort=#{orderSort}
			and POSITION(a.technology_number in #{technologyNumber})
			and a.review_status = 1
			group by a.process_id,a.order_sort,a.technology_number
			) as patch
			on patch.process_id = fc.process_id
			and patch.order_sort = fc.order_number
			and patch.technology_number = fc.technology_number
			left join sd.`order` as o on o.order_id=od.order_id

			WHERE
			fc.process_id = #{processId}
			and fc.order_number=#{orderSort}
			AND POSITION(fc.technology_number in #{technologyNumber})
			AND odpd.process = #{interceptProcess}
			group by fc.order_number,
			ogd.technology_number
			order by fc.order_number
			</select>
			</mapper>