From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 18 十月 2024 12:45:59 +0800 Subject: [PATCH] 电路站点报告调试+总报告ing --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 46 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java index 24cad7c..a15d44f 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java @@ -1,11 +1,16 @@ package com.yuanchu.mom.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yuanchu.mom.dto.InsOderDto; -import com.yuanchu.mom.dto.OrderThingDto; +import com.yuanchu.mom.dto.*; import com.yuanchu.mom.pojo.InsOrder; +import com.yuanchu.mom.pojo.InsSample; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -16,20 +21,37 @@ */ public interface InsOrderService extends IService<InsOrder> { - List<OrderThingDto> getOrderThing(); + //鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹� + Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto); - //鑾峰彇妫�楠屼笅鍗曟暟鎹� - Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, InsOrder itemParameter); + //鍒嗛厤绔欑偣 + int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory); - //娣诲姞妫�楠屼笅鍗曟暟鎹� - int addInsOrderParameter(InsOrder itemParameter); + int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing, List<MultipartFile> files); - //鍒犻櫎妫�楠屼笅鍗曟暟鎹� - int delInsOrderParameter(Integer id); + Map<String, Object> getInsOrder(Integer id); - //淇敼妫�楠屼笅鍗曟暟鎹� - int upInsOrderParameter(InsOrder itemParameter); + int upInsOrderOfState(InsOrder insOrder); - int addInsOrder(InsOderDto insOderDto); + int upInsOrderOfState2(InsOrder insOrder); + Map<String, Object> getInsOrderAndSample(Integer id, String laboratory); + + Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto); + + Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto); + + Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto); + + Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber); + + int updateStatus(Integer id); + + List<SampleProductDto3> labelPrinting(String ids); + + Map<String, List<InsSample>> checkNumber(String ids); + + void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException; + + int addNumber(List<InsSample> insSamples); } -- Gitblit v1.9.3