From bc3313efa51f00e128b6d9483becfd71df4e659d Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 09 八月 2024 18:14:51 +0800 Subject: [PATCH] 检验单审核添加对应试验室bug解决 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 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 ccb2eab..8e9a497 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 @@ -6,6 +6,9 @@ import com.yuanchu.mom.dto.*; import com.yuanchu.mom.pojo.InsOrder; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -16,13 +19,13 @@ */ public interface InsOrderService extends IService<InsOrder> { - //鑾峰彇妫�楠屼笅鍗曟暟鎹� + //鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹� Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto); //淇敼妫�楠屼笅鍗曟暟鎹� - int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId); + int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory); - int addInsOrder(List<SampleProductDto> list, InsOrder insOrder); + int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing); Map<String, Object> getInsOrder(Integer id); @@ -34,5 +37,13 @@ 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); + + void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException; } -- Gitblit v1.9.3