From fa0d4fc230b44c04b969b4f7c7bd0ea72a61572d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 06 九月 2023 18:02:41 +0800
Subject: [PATCH] 产品检验+过程检验(初步完成)
---
inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
index 7a7ae4a..38545ce 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.FinishedInspect;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.vo.FinishedInspectVo1;
+import com.yuanchu.mom.pojo.FinishedInspect;
+import com.yuanchu.mom.pojo.vo.FinishedInspectVo;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -20,15 +20,8 @@
*/
public interface FinishedInspectService extends IService<FinishedInspect> {
- @Transactional(rollbackFor = Exception.class)
- Integer addProcessInspectionSheet(FinishedInspect finishedInspect);
-
- Integer inspectionConclusion(String username, Integer finishedInspectId, Integer result);
-
- IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);
-
/**
- * 鏂板杩囩▼妫�楠屽崟-->鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧淇℃伅
+ * 鏂板妫�楠屽崟-->鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧淇℃伅
*
* @param orderNumber
* @return
@@ -36,19 +29,34 @@
List<Map<String, Object>> chooseMater(String orderNumber);
/**
- * 鏂板杩囩▼妫�楠屽崟
+ * 鏂板鎴愬搧妫�楠屽崟
*
- * @param finishedInspectVo1
+ * @param finishedInspectVo
* @return
*/
- String addProcess(String userId, FinishedInspectVo1 finishedInspectVo1);
+ Integer addProcessInspectionSheet(String userId, FinishedInspectVo finishedInspectVo);
+
/**
- * 鏂板杩囩▼妫�楠屽崟-->閫夋嫨璁惧
- * @param mtid
- * @param father
- * @param name
+ * 涓婃姤(鏇存柊妫�楠岀姸鎬�)
+ * @param id
* @return
*/
- List<Map<String,Object>> chooseDev(Integer technologyId, String father, String name);
+ String updateFinishInspectsById(String username,Integer id);
+
+ /**
+ * 鍒嗛〉鏌ヨ鎴愬搧妫�楠屽崟鍒楄〃
+ * @param page
+ * @param result
+ * @param material
+ * @return
+ */
+ IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer result, String material);
+
+ /**
+ * 鏍规嵁妫�楠屽崟id鏌ヨ鎴愬搧妫�楠屽崟璇︽儏
+ * @param id
+ * @return
+ */
+ List<Map<String,Object>> selectFinishInspectsListById(Integer id);
}
--
Gitblit v1.9.3