From b8d16e1a4a2973e879a54ff001a5a8fa358f183f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:38:02 +0800
Subject: [PATCH] IFS物料批次属性填写调整：工厂域动态取值

---
 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 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 94a172a..59b8af7 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
@@ -4,14 +4,17 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
+import com.ruoyi.basic.dto.InventoryDetailDTO;
 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 +27,7 @@
  * @createDate 2024-03-12 16:17:55
  * @Entity com.yuanchu.mom.pojo.InsOrder
  */
+@Mapper
 public interface InsOrderMapper extends BaseMapper<InsOrder> {
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
@@ -35,6 +39,7 @@
     IPage<SampleProductDto2> selectSampleAndProductByOrderId(@Param("page") IPage<SampleProductDto2> page, @Param("ew") QueryWrapper<SampleProductDto2> ew, @Param("id") Integer id);
 
     List<Map<String, String>> selectDeviceList(@Param("managementNumbers") Set<String> managementNumbers);
+
     List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
 
     String getStandardMethodCode(@Param("id") Integer id);
@@ -49,6 +54,7 @@
 
     /**
      * 鏌ヨ妫�楠岀粨鏋�
+     *
      * @param ids
      * @return
      */
@@ -56,6 +62,7 @@
 
     /**
      * 鑾峰彇鎵归噺妫�楠岀殑鎬绘暟
+     *
      * @param id
      * @return
      */
@@ -63,13 +70,13 @@
 
     /**
      * 鑾峰彇绾胯姱棰滆壊
+     *
      * @param id
      * @return
      */
     List<String> selectSampleCableTag(@Param("id") Integer id);
 
     /**
-     *
      * @param orderId
      * @return
      */
@@ -77,6 +84,7 @@
 
     /**
      * 鍙煡璇㈤粯璁ょ涓�涓殑浜у搧
+     *
      * @param id
      * @return
      */
@@ -84,20 +92,19 @@
 
     /**
      * 鏌ヨ鏃ュ巻鍥�
+     *
      * @param
      * @return
      */
     List<Map<String, Object>> selectCalendarWorkByWeek(@Param("day") Integer day);
 
     /**
-     *
      * @param partNo
      * @return
      */
     StructureTestObject selectProductByPartNo(@Param("partNo") String partNo);
 
     /**
-     *
      * @param partNo
      * @return
      */
@@ -105,19 +112,24 @@
 
     /**
      * 鎴愬搧鏍囩鎵撳嵃
+     *
      * @param ids
      * @return
      */
     List<InsOrderPrintingVo> labelOrderPrinting(@Param("ids") List<Integer> ids);
 
+    List<InventoryDetailDTO> labelOutsideOrderPrinting(@Param("ids") List<Integer> ids);
+
     /**
      * 鏌ヨ瀵煎嚭淇℃伅
+     *
      * @return
      */
     List<SampleOrderDto> rawAllInsOrderExport(@Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll);
 
     /**
      * 鏍规嵁璁㈠崟鏌ヨ璇曢獙瀹�
+     *
      * @param insOrderId
      * @return
      */
@@ -125,6 +137,7 @@
 
     /**
      * 鏌ヨ璁㈠崟淇℃伅
+     *
      * @param insSampleId
      * @return
      */
@@ -132,8 +145,22 @@
 
     /**
      * 鏍规嵁璁㈠崟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