From 1d9f79e7853d8d9b51c35817a5466db5a1a0b7e3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 17 十二月 2025 09:55:43 +0800
Subject: [PATCH] 订单拆分生成系统编号逻辑调整3
---
inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 7707de8..3cc8a95 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
@@ -2,18 +2,22 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto;
+import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
+import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
+import com.ruoyi.basic.vo.IfsInventoryQuantityVO;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.inspect.dto.CopperInsOrderDto;
+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;
-import java.util.Map;
/**
* @Author zhuo
@@ -29,7 +33,7 @@
* @param ifsInventoryQuantity
* @return
*/
- IPage<IfsInventoryQuantity> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
+ IPage<IfsInventoryQuantityVO> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
/**
* 鏌ヨ妫�楠屽��
@@ -39,9 +43,9 @@
*/
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);
@@ -54,7 +58,7 @@
* @param ifsInventoryId
* @return
*/
- boolean repealRawOrder(Integer ifsInventoryId);
+ boolean repealRawOrder(Long ifsInventoryId);
/**
* 娣诲姞鍏嶆璁㈠崟
@@ -81,14 +85,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);
/**
* 鎵嬪姩娣诲姞鍘熸潗淇℃伅
@@ -109,7 +113,7 @@
* @param ifsInventoryId
* @return
*/
- boolean concessionRelease(Integer ifsInventoryId);
+ boolean concessionRelease(Long ifsInventoryId);
/**
* 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
@@ -145,5 +149,11 @@
* @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