lims-ruoyi-after.git

			@@ -4,11 +4,13 @@
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.inspect.dto.InsOrderPlanDTO;
			import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
			import com.ruoyi.inspect.dto.SaveInsContextDto;
			import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
			import com.ruoyi.inspect.pojo.InsOrderFile;
			import com.ruoyi.inspect.pojo.InsProduct;
			import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
			import com.ruoyi.inspect.vo.InsOrderPlanVO;
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.multipart.MultipartFile;

			import java.util.List;
			@@ -24,7 +26,7 @@

			boolean claimInsOrderPlan(InsOrderPlanDTO entity);

			void saveInsContext(Map<String, Object> insContext,Integer currentTable,Integer sampleId,Integer orderId,String sonLaboratory);
			void saveInsContext(SaveInsContextDto saveInsContextDto);

			Map<String, Object> doInsOrder(Integer id, String laboratory);

			@@ -69,30 +71,19 @@
			*/
			List<Map<String, Object>> getRepetitionTag(Integer id, String laboratory, String cableTag);

			/**
			* 获取不合格数据
			* @return
			*/
			List<InsProduct> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto);

			/**
			* 新增不合格复测内容给
			* @param ids
			* @return
			*/
			boolean addDisqualificationRetest(List<Integer> ids);
			boolean addDisqualificationRetest(List<InsProduct> insProductsList);

			/**
			* 获取不合格复测数据
			* @param id
			* @param type
			* @param laboratory
			* @param cableTag
			* @param rawMaterialTag
			* @param retestTag
			* @return
			*/
			List<InsProduct> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag);
			List<InsProduct> getInsProductUnqualifiedRetest(InsOrderPlanProductDto insOrderPlanProductDto);

			/**
			* 保存不合格复测检验内容