From a1e19c7466cce45b5bb360e38ab7c7c1753986f2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 13 一月 2026 15:03:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

---
 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 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 ab022c5..ef8614b 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
+import com.ruoyi.basic.dto.InventoryDetailDTO;
+import com.ruoyi.basic.pojo.IfsInventoryQuantity;
 import com.ruoyi.basic.pojo.StandardProductList;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.inspect.pojo.InsOrder;
@@ -29,7 +32,7 @@
 
 
     //淇敼妫�楠屼笅鍗曟暟鎹�
-    int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory);
+    int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId, String sonLaboratory);
 
     int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);
 
@@ -46,10 +49,11 @@
 
 
     // 鑾峰彇ifs搴撳瓨淇℃伅
-    void getIfsOrder();
+    void getIfsOrder(Map<String, Object> objectMap, Boolean isSplitOrder);
 
     /**
      * 淇敼璁㈠崟鍗曞彿
+     *
      * @param insOrder
      */
     void updateEntrustCode(InsOrder insOrder);
@@ -57,11 +61,11 @@
     List<InsUnqualifiedRetestProduct> getRetestResult(Integer insProductId);
 
 
-
-    void updateIfsInventoryQuantity(Integer id);
+    void updateIfsInventoryQuantity(Long id);
 
     /**
      * 閾滄潗涓嬪崟
+     *
      * @param list
      * @param copperInsOrder
      * @return
@@ -70,6 +74,7 @@
 
     /**
      * 淇敼濮旀墭缂栧彿
+     *
      * @param insOrder
      */
     void updateOrderEntrustCode(InsOrder insOrder);
@@ -77,6 +82,7 @@
 
     /**
      * 淇敼妫�楠屼笅鍗曞唴瀹�
+     *
      * @param insOrderUpdateDto
      * @return
      */
@@ -84,13 +90,17 @@
 
     /**
      * 鎴愬搧鏍囩鎵撳嵃
+     *
      * @param ids
      * @return
      */
     List<InsOrderPrintingVo> labelOrderPrinting(List<Integer> ids);
 
+    List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids);
+
     /**
      * 鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�
+     *
      * @param insSampleId
      * @return
      */
@@ -98,6 +108,7 @@
 
     /**
      * 娣诲姞閬楁紡鐨勬楠岄」
+     *
      * @param omitOrderProductDto
      * @return
      */
@@ -105,6 +116,7 @@
 
     /**
      * 鎴愬搧妫�楠屽崟瀵煎嚭
+     *
      * @param sampleOrderDto
      * @param response
      */
@@ -112,15 +124,28 @@
 
     /**
      * 淇敼鏍峰搧鍨嬪彿
+     *
      * @param insSample
      */
     void updateSampleModel(InsSample insSample);
 
     /**
      * 鏌ヨ褰撳墠鏃堕棿鏄惁娌℃湁璇ユ娴嬮」鐨勬娊鏍疯鍒�
+     *
      * @param sampleList
      * @param insOrder
      * @return
      */
     Result judgeNotSpotCheckOrder(List<SampleProductDto> sampleList, InsOrder insOrder);
+
+
+    /**
+     * 绉诲簱鎿嶄綔
+     *
+     * @param one
+     * @return
+     */
+    String moveRawMaterial(IfsInventoryQuantity one);
+
+
 }

--
Gitblit v1.9.3