ERP_override.git

			@@ -12,7 +12,12 @@
			public interface ReportingWorkMapper extends MPJBaseMapper<ReportingWork> {


			ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr, String previousProcess, String nextProcess, String process, String reportType);
			ReportingWork AddSelectLastWorkMp(String processIdStr,
			String technologyStr,
			String previousProcess,
			String nextProcess,
			String process,
			String reportType);

			List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);

			@@ -3460,8 +3460,13 @@
			SELECT g.*
			,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
			from( SELECT f.*,
			e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
			(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
			if((e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity)>0,
			(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity),
			0
			) as quantity,
			if((e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity)>0,
			(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity) ,
			0)*f.area as glassArea
			from (SELECT a.order_id,
			if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
			C.product_id,
			@@ -3474,7 +3479,8 @@
			b.id,
			c.area,
			d.glass_child,
			ifnull(cb.patchNumSum,0) as patchNumSum
			ifnull(cb.patchNumSum,0) as patchNumSum,
			fc.termination_quantity

			FROM sd.`order` as a
			LEFT JOIN sd.order_process_detail as b
			@@ -3536,6 +3542,7 @@


			) as h
			where h.quantity >0
			<choose>
			<when test="optionVal == 1">
			GROUP BY thisProcess

	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史