ERP_override.git

			@@ -16,7 +16,7 @@

			List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);

			List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);
			List<Map<String,String>> SelectWorkBasicTeamsMp(String process);

			String SelectTechnologicalProcess(String processIdStr, String technologyStr);

			@@ -98,4 +98,12 @@
			List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess, String laminating);

			String getProcessLaminating(String process);

			String selectOrderid(String processIdStr);

			Map<String,Float> getFootSum(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);

			Integer selectReviewedState(String reportingWorkId);

			List<ReportingWork> qualityReviewSearchMp();
			}