From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
index fefb514..a26f141 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
@@ -1,11 +1,16 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.dto.ReportPageDto;
-import com.yuanchu.mom.pojo.InsReport;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.InsOrderStateDto;
+import com.yuanchu.mom.dto.InsReportDto;
+import com.yuanchu.mom.dto.ReportPageDto;
+import com.yuanchu.mom.pojo.InsOrderState;
+import com.yuanchu.mom.pojo.InsReport;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.List;
import java.util.Map;
/**
@@ -17,7 +22,7 @@
Map<String,Object> pageInsReport(Page page, ReportPageDto reportPageDto);
- String wordToHtml(String path);
+ void wordToPdf(String path,String sealUrl);
int inReport(String url, Integer id);
@@ -30,5 +35,17 @@
int examineReport(Integer id, Integer isExamine, String examineTell);
//鎵瑰噯
- int ratifyReport(Integer id, Integer isRatify, String ratifyTell);
+ int ratifyReport(Integer id, Integer isRatify, String ratifyTell,String sealUrl);
+
+ int wordInsertUrl(Map<String, Object> map, String url);
+
+ String downAll(String ids);
+
+ int upAll(MultipartFile file) throws IOException;
+
+ //鏄惁鐢熸垚鎬绘姤鍛�
+ int isReport(InsReportDto insReportDto);
+
+ //鏌ュ嚭璇ヨ鍗曚笅姣忎釜鏍峰搧涓嬫瘡涓珯鐐逛笅鐨勬楠屾鏁�
+ List<InsOrderStateDto> getInsOrderStateCount(Integer id);
}
--
Gitblit v1.9.3