From 004ee58feda41620f621db1fb8773f1b56eaf71e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 30 十二月 2025 14:28:41 +0800
Subject: [PATCH] 外购成品功能迁移v1

---
 inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java |   37 +++++++++++++++++++++++++------------
 1 files changed, 25 insertions(+), 12 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 5644cdc..85b6577 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,23 +1,21 @@
 package com.ruoyi.inspect.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 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.common.annotation.PersonalScope;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.enums.OrderType;
+import com.ruoyi.common.utils.WxCpUtils;
+import com.ruoyi.framework.exception.ErrorException;
 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;
 import com.ruoyi.inspect.service.InsOrderService;
 import com.ruoyi.inspect.service.RawMaterialOrderService;
 import com.ruoyi.inspect.service.RawMaterialOrderTemplateService;
-import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.utils.JackSonUtil;
-import com.ruoyi.common.utils.WxCpUtils;
-import com.ruoyi.inspect.dto.CopperInsOrderDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -30,6 +28,7 @@
 import java.io.File;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @Author zhuo
@@ -106,7 +105,11 @@
     @PostMapping("/inspectionReport")
     public Result<?> inspectionReport(@RequestBody Map<String, Object> param) {
         List<Long> ids = (List<Long>) param.get("ids");
-        return Result.success(rawMaterialOrderService.inspectionReport(ids));
+        String orderType = Objects.nonNull(param.get("orderType"))?param.get("orderType").toString():"";
+        if(!OrderType.validateValue(orderType)){
+            throw new ErrorException("鎵归噺鎶ユ澶辫触,闈炴硶鐨勯攢鍞鍗曞垎绫绘灇涓�");
+        }
+        return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType));
     }
 
     /**
@@ -141,7 +144,6 @@
     @ApiOperation(value = "鎶ユ")
     @PostMapping("/inspectionReportOne")
     public Result<?> inspectionReportOne(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
-
         return Result.success(rawMaterialOrderService.inspectionReportOne(ifsInventoryQuantity));
     }
 
@@ -178,7 +180,7 @@
 
     @ApiOperation(value = "浠撳簱鎶ユ鏌ヨ")
     @GetMapping("/getWarehouseSubmit")
-    public Result getWarehouseSubmit(Page page, IfsInventoryQuantity ifsInventoryQuantity) throws Exception {
+    public Result getWarehouseSubmit(Page page, IfsInventoryQuantity ifsInventoryQuantity) {
         return Result.success(rawMaterialOrderService.getWarehouseSubmit(page, ifsInventoryQuantity));
     }
 
@@ -222,6 +224,7 @@
     @PreAuthorize("@ss.hasPermi('get:Ifs:ByAll')")
     @GetMapping("/getIfsByAll")
     public Result getIfsByAll(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
+        ifsInventoryQuantityDto.setOrderType(OrderType.RAW.getValue());
         return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
     }
 
@@ -237,6 +240,7 @@
     @GetMapping("/getIfsByFinish")
     public Result getIfsByFinish(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
         ifsInventoryQuantityDto.setIsFinish(1);
+        ifsInventoryQuantityDto.setOrderType(OrderType.RAW.getValue());
         return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
     }
 
@@ -350,4 +354,13 @@
         return Result.success(rawMaterialOrderService.confirmSplitOrder(orderSplitDTO));
     }
 
+    /**
+     * 鏍规嵁ifsId鏌ヨ涓嬪崟鏁伴噺
+     */
+    @ApiOperation(value = "鏍规嵁ifsId鏌ヨ涓嬪崟鏁伴噺")
+    @GetMapping("/getOrderCountByIfsId/{ifsId}")
+    public Result getOrderCountByIfsId(@PathVariable("ifsId") Long ifsId){
+        return Result.success(rawMaterialOrderService.getOrderCountByIfsId(ifsId));
+    }
+
 }

--
Gitblit v1.9.3