From e1284aa3b1b400ecebb59126d7110a3bb4a6b000 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 31 十月 2025 15:46:09 +0800
Subject: [PATCH] 原材料报检拆分功能V1

---
 inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
index 9881b40..e6ceea9 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
@@ -4,11 +4,15 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.basic.dto.*;
 import com.ruoyi.basic.pojo.IfsInventoryQuantity;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.inspect.dto.OrderSplitDTO;
 import com.ruoyi.inspect.dto.SampleProductDto;
 import com.ruoyi.inspect.pojo.InsOrder;
 import com.ruoyi.inspect.dto.CopperInsOrderDto;
 import com.ruoyi.inspect.dto.RawMaterialStandardTreeDto;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
@@ -20,7 +24,7 @@
  */
 public interface RawMaterialOrderService {
 
-    RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo);
+    Result selectStandardTreeListByPartNo(String partNo);
 
     /**
      * 鎶ユ鏌ヨ
@@ -28,7 +32,7 @@
      * @param ifsInventoryQuantity
      * @return
      */
-    Map<String,Object> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
+    IPage<IfsInventoryQuantity> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
 
     /**
      * 鏌ヨ妫�楠屽��
@@ -36,11 +40,11 @@
      * @param ifsInventoryQuantityDto
      * @return
      */
-    Map<String,Object> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);
+    IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);
 
-    int inspectionReport(List<Integer> ids);
+    int inspectionReport(List<Long> ids);
 
-    int revokeInspectionReport(Integer id);
+    int revokeInspectionReport(Long id);
 
     List<IfsInventoryQuantityDto> printLabel(List<Integer> ids);
 
@@ -53,7 +57,7 @@
      * @param ifsInventoryId
      * @return
      */
-    boolean repealRawOrder(Integer ifsInventoryId);
+    boolean repealRawOrder(Long ifsInventoryId);
 
     /**
      * 娣诲姞鍏嶆璁㈠崟
@@ -63,7 +67,7 @@
      */
     int addExemptionOrder(List<SampleProductDto> list, InsOrder insOrder);
 
-    Map<String,Object> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, IfsInventoryQuantityCheckDto ifsInventoryQuantity);
+    IPage<IfsInventoryQuantityCheckDto> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, IfsInventoryQuantityCheckDto ifsInventoryQuantity);
 
     /**
      * 鏌ヨ宸叉楠�
@@ -71,7 +75,7 @@
      * @param ifsInventoryQuantityDto
      * @return
      */
-    Map<String,Object>  getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto);
+    IPage<IfsInventoryQuantitySupplierDto>  getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto);
 
     int delIfsInventory(Integer id);
 
@@ -80,14 +84,14 @@
      * @param ifsInventoryId
      * @return
      */
-    boolean rawOrderRelease(Integer ifsInventoryId, String partDetail);
+    boolean rawOrderRelease(Long ifsInventoryId, String partDetail);
 
     /**
      * 鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�
      * @param ifsInventoryId
      * @return
      */
-    int notificationRawOrder(Integer ifsInventoryId);
+    int notificationRawOrder(Long ifsInventoryId);
 
     /**
      * 鎵嬪姩娣诲姞鍘熸潗淇℃伅
@@ -95,7 +99,6 @@
      */
     void addIfsInventoryQuantity(IfsInventoryQuantity ifsInventoryQuantity);
 
-    void shiftingParking(List<Integer> ids);
 
     /**
      * 閾滃崟涓濅笅鍗曞厤妫�
@@ -109,7 +112,7 @@
      * @param ifsInventoryId
      * @return
      */
-    boolean concessionRelease(Integer ifsInventoryId);
+    boolean concessionRelease(Long ifsInventoryId);
 
     /**
      * 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
@@ -138,12 +141,18 @@
      * @param ifsInventoryQuantityDto
      * @return
      */
-    Map<String,Object> getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto);
+    IPage<IfsInventoryQuantitySupplierDto> getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto);
 
     /**
      * advancedGodown
      * @param ifsInventoryId
      * @return
      */
-    boolean advancedGodown(Integer ifsInventoryId);
+    boolean advancedGodown(Long ifsInventoryId);
+
+    void downloadTemplate(HttpServletResponse response);
+
+    Result importSplitOrderData(MultipartFile file, Long ifsId, HttpServletRequest request);
+
+    boolean confirmSplitOrder(OrderSplitDTO orderSplitDTO);
 }

--
Gitblit v1.9.3