ERP_override.git

			@@ -153,9 +153,12 @@
			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
			where a.process_id=#{processIdStr}
			right join reporting_work
			on a.reporting_work_id=reporting_work.reporting_work_id
			where
			reporting_work.this_process = #{process}
			and a.process_id=#{processIdStr}
			and a.technology_number = #{technologyStr}
			and a.patch_processes = #{process}
			and a.review_status = 1
			group by a.process_id,a.order_sort,a.technology_number
			) as patch
			@@ -465,8 +468,9 @@
			and f.this_process = b.this_process
			and f.order_number = a.order_number
			and f.technology_number = a.technology_number

			<if test="nextProcess != null and nextProcess != ''">
			left join (select ifnull(sum(completed_quantity),0) as completed_quantity ,
			left join (select sum(ifnull(completed_quantity,0)+ifnull(breakage_quantity,0)) as completed_quantity ,
			rw.process_id,
			rwd.order_number,
			rwd.technology_number,

	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -785,7 +785,6 @@
			}
			}


			titleUploadData.value.creator = user.user.userName
			titleUploadData.value.creatorId = user.user.userId
			const requestDetailData = xGrid.value.getTableData().fullData.filter((row) => {