ERP_override.git

			@@ -64,6 +64,7 @@

			</resultMap>

			<!-- 查询当前工序的表头数据-->
			<select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
			select o.order_id,
			fc.production_id,
			@@ -148,7 +149,7 @@
			left join
			(select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
			from patch_log
			group by reporting_work_id,order_sort,technology_number) as c
			group by process_id,order_sort,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
			@@ -207,7 +208,7 @@
			left join
			(select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
			from patch_log
			group by reporting_work_id,order_sort,technology_number) as c
			group by process_id,order_sort,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
			@@ -321,7 +322,7 @@
			and c.technology_number = a.technology_number

			where
			a.process_id=SUBSTR(#{processId} from 1 for 13)
			a.process_id=SUBSTR(#{processId} from 1 for 14)
			and a.order_number = #{orderNumber}
			and a.technology_number = #{technologyNumber}
			</select>
			@@ -345,7 +346,7 @@
			and c.technology_number = a.technology_number

			where
			a.process_id=SUBSTR(#{processId} from 1 for 13)
			a.process_id=SUBSTR(#{processId} from 1 for 14)
			and a.order_number = #{orderNumber}
			and a.technology_number = #{technologyNumber}
			</select>
			@@ -451,9 +452,9 @@
			o.batch,
			rw.this_process,
			rw.this_completed_quantity,
			(ogd.area * rw.this_completed_quantity) as completedArea,
			round(ogd.area * rw.this_completed_quantity,2) as completedArea,
			rw.this_worn_quantity,
			(ogd.area * rw.this_worn_quantity) as wornArea,
			round(ogd.area * rw.this_worn_quantity,2) as wornArea,
			rw.device_name,
			rw.teams_groups_name,
			rw.reviewed_state