ERP_override.git

			@@ -24,7 +24,7 @@

			List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr, String process, String reportType);

			List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process);
			List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess);

			List<Map<String,String>> SelectProcessMp();

			@@ -134,7 +134,7 @@
			map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process,reportType));
			} else {
			//不是第一道工序，查询报工数据
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process);
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess);
			if(process.equals("中空")){
			String orderId = processIdStr.substring(0,10);
			details.forEach( detail -> {

			@@ -206,7 +206,7 @@
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			<if test="process == '夹胶'">
			<if test="process == '夹胶' or (process == '打胶和粘框' and previousProcess=='夹胶')">
			AND ogd.`group` = (select `group`
			from sd.order_glass_detail
			where order_id = ogd.order_id
			@@ -248,7 +248,7 @@

			WHERE
			fc.process_id = #{processIdStr}
			<if test="process != '中空' and process != '夹胶' and process != '包装'">
			<if test="process != '中空' and process != '夹胶' and process != '包装' and process != '打胶和粘框' ">
			AND fc.technology_number = #{technologyStr}
			</if>
			AND odpd.process = #{process}

	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史