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);

			@@ -131,6 +134,8 @@

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

			List<Map<String, Object>> getDetailListMerge(String processId, String process);

			List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);

			List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber, String orderId);
			@@ -190,6 +195,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);

			@@ -214,4 +220,6 @@
			Integer updateProjectProcessPrintCount(String projectNo);

			Integer selectProjectProcessPrintCount(String projectNo);

			int flowCardToOptimizeCount(String orderId);
			}