From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
index b0cff7f..c79af35 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yuanchu.mom.pojo.InspectUnaccepted;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 
@@ -16,13 +17,47 @@
 public interface InspectUnacceptedService extends IService<InspectUnaccepted> {
 
     /**
-     *鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+     *鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
      * @param
      * @param formTime
      * @param dealState
      * @return
      */
-    IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState);
+    IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories);
 
+    /**
+     * 鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+     * @param page
+     * @param formTime
+     * @param productName
+     * @param supplier
+     * @param processingStatus
+     * @return
+     */
+    IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
+
+    /**
+     * 涓嶅悎鏍煎搧澶勭疆鍒嗛〉鍒楄〃
+     * @param page
+     * @param specificationModel
+     * @param productName
+     * @param productCategories
+     * @param state
+     * @return
+     */
+    IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state);
+
+    /**
+     * 澶辩劍鏇存柊鐜板儚鎻忚堪
+     * @param rawUnacceptedId
+     * @return
+     */
+    Integer descriptionUpdate(Integer rawUnacceptedId, String tell);
+
+    //璇勫
+    Integer rawEvaluate(Integer rawId, Integer passOrNo);
+
+    @Transactional(rollbackFor = Exception.class)
+    Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type);
 }
 

--
Gitblit v1.9.3