ERP_override.git

			@@ -40,6 +40,8 @@
			//查询报工表内是否存在对应流程卡的数据
			Integer reportingWorkCount(String processId);

			Integer reportingWorkCountByOrderId(String orderId);

			//插入Flow_card表
			Boolean addFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName, Integer layer);

			@@ -66,6 +68,7 @@
			List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);

			Boolean deleteReportingWork(String processId);
			Boolean deleteReportingWorkByOrderId(String orderId);

			List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);

			@@ -105,13 +108,15 @@

			List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);

			List<Map<String, Object>> getPrintCustomData(String processId, String technologyNumber);
			List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber);

			List<Map<String, Object>> getPrintCustomData2(String processId);

			Integer getPrintLabelCount(String processId, String technologyNumber);

			List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);

			List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId);
			List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);

			List<Map<String, Object>> getGlassNumber(String technologyNumber, String processId);

			@@ -153,7 +158,7 @@

			List<Map<String, String>> selectPrintNotMergeMp(String orderId);

			List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId);
			List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);

			List<Map<String, String>> selectPrintAllMp(String orderId);

			@@ -188,6 +193,7 @@
			Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);

			Boolean deleteflowCardSort(String orderId, String processId);
			Boolean deleteflowCardSortByOrderId(String orderId);

			List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);

			@@ -212,4 +218,6 @@
			Integer updateProjectProcessPrintCount(String projectNo);

			Integer selectProjectProcessPrintCount(String projectNo);

			int flowCardToOptimizeCount(String orderId);
			}