From 0e5bddf6084d3dfb7bcad7217d4320898416eba3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 23 十月 2025 16:49:12 +0800
Subject: [PATCH] 拆分原材料和外购成品的业务流程(报检、下单、检验)
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
index 449c56d..1d69e5e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
@@ -5,13 +5,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.StructureTestObject;
-import com.ruoyi.inspect.dto.CostStatisticsDto;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.dto.SampleProductDto2;
import com.ruoyi.inspect.dto.SampleProductExportDto;
import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.vo.IfsOrderVO;
import com.ruoyi.inspect.vo.InsOrderPrintingVo;
import com.ruoyi.inspect.vo.SampleDefectsFatherVo;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -24,6 +25,7 @@
* @createDate 2024-03-12 16:17:55
* @Entity com.yuanchu.mom.pojo.InsOrder
*/
+@Mapper
public interface InsOrderMapper extends BaseMapper<InsOrder> {
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@@ -110,6 +112,10 @@
*/
List<InsOrderPrintingVo> labelOrderPrinting(@Param("ids") List<Integer> ids);
+ /**
+ * 鏌ヨ瀵煎嚭淇℃伅
+ * @return
+ */
List<SampleOrderDto> rawAllInsOrderExport(@Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll);
/**
@@ -119,5 +125,28 @@
*/
String selectLaboratoryByOrderId(@Param("insOrderId") Integer insOrderId);
+ /**
+ * 鏌ヨ璁㈠崟淇℃伅
+ * @param insSampleId
+ * @return
+ */
InsOrder selectFirstSubmit(@Param("insSampleId") Integer insSampleId);
+
+ /**
+ * 鏍规嵁璁㈠崟id鏌ヨ璁㈠崟瀵煎嚭淇℃伅
+ * @param orderIds
+ * @return
+ */
+ List<SampleOrderDto> getInsOrderExportByIds(@Param("orderIds") List<String> orderIds);
+
+ /**
+ * 鏌ヨ褰撳墠鏃堕棿鏄惁鏈夎妫�娴嬮」鐨勬娊鏍疯鍒掕鍗�
+ * @param itmeId 鏍峰搧Id
+ * @param startTime 寮�濮嬫椂闂�
+ * @param endTime 缁撴潫鏃堕棿
+ * @return
+ */
+ Integer selectNotSpotCheckOrder(@Param("itmeId") Integer itmeId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+ IfsOrderVO selectOrderInfoById(@Param("id") Integer id);
}
--
Gitblit v1.9.3