From 2bb12b1ca40b29b7edcf06ef3f3d6de24dde1c4c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 24 九月 2025 14:59:17 +0800
Subject: [PATCH] 原材料订单拆分功能v1

---
 inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
index 189dd0b..b1f7a65 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.inspect.controller;
 
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,6 +8,7 @@
 import com.ruoyi.basic.pojo.IfsInventoryQuantity;
 import com.ruoyi.common.annotation.PersonalScope;
 import com.ruoyi.inspect.dto.InsPlaceOrderDto;
+import com.ruoyi.inspect.dto.OrderSplitDTO;
 import com.ruoyi.inspect.dto.SampleProductDto;
 import com.ruoyi.inspect.pojo.InsOrder;
 import com.ruoyi.inspect.pojo.RawMaterialOrderTemplate;
@@ -22,7 +24,9 @@
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.util.List;
@@ -93,7 +97,6 @@
         return Result.success(rawMaterialOrderTemplateService.delRawMaterOrderTemplate(id));
     }
 
-
     /**
      * 鎶ユ鎵归噺
      * @param param 鍘熸潗鏂檌d
@@ -102,7 +105,7 @@
     @ApiOperation(value = "鎶ユ鎵归噺")
     @PostMapping("/inspectionReport")
     public Result<?> inspectionReport(@RequestBody Map<String, Object> param) {
-        List<Integer> ids = (List<Integer>) param.get("ids");
+        List<Long> ids = (List<Long>) param.get("ids");
         return Result.success(rawMaterialOrderService.inspectionReport(ids));
     }
 
@@ -114,7 +117,7 @@
     @ApiOperation(value = "鎾ら攢鎶ユ")
     @PostMapping("/revokeInspectionReport")
     public Result<?> revokeInspectionReport(@RequestBody Map<String, Object> param) {
-        Integer id = (Integer) param.get("id");
+        Long id = Long.parseLong(param.get("id").toString());
         return Result.success(rawMaterialOrderService.revokeInspectionReport(id));
     }
 
@@ -138,7 +141,6 @@
     @ApiOperation(value = "鎶ユ")
     @PostMapping("/inspectionReportOne")
     public Result<?> inspectionReportOne(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
-
         return Result.success(rawMaterialOrderService.inspectionReportOne(ifsInventoryQuantity));
     }
 
@@ -161,7 +163,7 @@
     @ApiOperation(value = "鍘熸潗鏂欐挙閿�涓嬪崟")
     @GetMapping("/repealRawOrder")
     public Result<?> repealRawOrder(@RequestBody Map<String, Object> param){
-        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+        Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
         return Result.success(rawMaterialOrderService.repealRawOrder(ifsInventoryId));
     }
 
@@ -198,7 +200,7 @@
     @ApiOperation(value = "鍘熸潗鏂欎笅鍗曟斁琛屽厤妫�")
     @PostMapping("/rawOrderRelease")
     public Result<?> rawOrderRelease(@RequestBody Map<String, Object> param){
-        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+        Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
         String partDetail = (String) param.get("partDetail");
         return Result.success(rawMaterialOrderService.rawOrderRelease(ifsInventoryId, partDetail));
     }
@@ -210,7 +212,7 @@
      */
     @ApiOperation(value = "鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�")
     @GetMapping("/notificationRawOrder")
-    public Result<?> notificationRawOrder(Integer ifsInventoryId){
+    public Result<?> notificationRawOrder(Long ifsInventoryId){
         return Result.success(rawMaterialOrderService.notificationRawOrder(ifsInventoryId));
     }
 
@@ -266,7 +268,7 @@
     @ApiOperation(value = "璁╂鏀捐")
     @PostMapping("/concessionRelease")
     public Result<?> concessionRelease(@RequestBody Map<String, Object> param){
-        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+        Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
         return Result.success(rawMaterialOrderService.concessionRelease(ifsInventoryId));
     }
 
@@ -316,8 +318,35 @@
     @ApiOperation(value = "鎻愬墠鍏ュ簱")
     @PostMapping("/advancedGodown")
     public Result<?> advancedGodown(@RequestBody Map<String, Object> param){
-        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+        Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
         return Result.success(rawMaterialOrderService.advancedGodown(ifsInventoryId));
     }
 
+    /**
+     * 涓嬭浇璁㈠崟鎷嗗垎瀵煎叆妯℃澘
+     */
+    @ApiOperation(value = "涓嬭浇璁㈠崟鎷嗗垎瀵煎叆妯℃澘")
+    @GetMapping("/downloadTemplate")
+    public void downloadTemplate(HttpServletResponse response){
+        rawMaterialOrderService.downloadTemplate(response);
+    }
+
+    /**
+     * 涓嬭浇璁㈠崟鎷嗗垎瀵煎叆妯℃澘
+     */
+    @ApiOperation(value = "瀵煎叆璁㈠崟鎷嗗垎鏁版嵁")
+    @PostMapping("/importSplitOrderData")
+    public Result importSplitOrderData(@RequestParam(value = "file") MultipartFile file,@RequestParam("ifsId") Long ifsId, HttpServletRequest request){
+        return rawMaterialOrderService.importSplitOrderData(file,ifsId,request);
+    }
+
+    /**
+     * 纭鎷嗗垎璁㈠崟
+     */
+    @ApiOperation(value = "纭鎷嗗垎璁㈠崟")
+    @PostMapping("/confirmSplitOrder")
+    public Result confirmSplitOrder(@RequestBody OrderSplitDTO orderSplitDTO){
+        return Result.success(rawMaterialOrderService.confirmSplitOrder(orderSplitDTO));
+    }
+
 }

--
Gitblit v1.9.3