From fe2d7c404c69700404814e18a70d5e606916486b Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期四, 24 七月 2025 15:04:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns --- inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java index a0a8192..ab022c5 100644 --- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.basic.pojo.StandardProductList; +import com.ruoyi.common.core.domain.Result; import com.ruoyi.inspect.pojo.InsOrder; import com.ruoyi.inspect.pojo.InsSample; import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct; @@ -114,4 +115,12 @@ * @param insSample */ void updateSampleModel(InsSample insSample); + + /** + * 鏌ヨ褰撳墠鏃堕棿鏄惁娌℃湁璇ユ娴嬮」鐨勬娊鏍疯鍒� + * @param sampleList + * @param insOrder + * @return + */ + Result judgeNotSpotCheckOrder(List<SampleProductDto> sampleList, InsOrder insOrder); } -- Gitblit v1.9.3