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/controller/InsOrderController.java |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 2f95736..6250602 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -1,15 +1,11 @@
 package com.ruoyi.inspect.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
 import com.ruoyi.basic.pojo.IfsInventoryQuantity;
 import com.ruoyi.basic.pojo.StandardProductList;
 import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.utils.JackSonUtil;
 import com.ruoyi.framework.exception.ErrorException;
 import com.ruoyi.inspect.dto.*;
 import com.ruoyi.inspect.pojo.InsOrder;
@@ -26,14 +22,13 @@
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -76,6 +71,7 @@
     }
 
     @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+    @PreAuthorize("@ss.hasPermi('add:insOrder')")
     @PostMapping("/addInsOrder")
     public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
         return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
@@ -156,7 +152,7 @@
         Integer orderId = (Integer) param.get("orderId");
         String ids = (String) param.get("ids");
         Integer typeSource = (Integer) param.get("typeSource");
-        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+        Long ifsInventoryId = (Long) param.get("ifsInventoryId");
         if(Objects.nonNull(typeSource) && typeSource == 1){
             ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
                     .set(IfsInventoryQuantity::getState,0)
@@ -180,7 +176,10 @@
     @ApiOperation(value = "鑾峰彇ifs璁㈠崟")
     @GetMapping("/getIfsOrder")
     public Result<?> getIfsOrder() {
-        insOrderService.getIfsOrder();
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("LOCATION_NO","1302");
+        map.put("STATE_DB","To be Inspected");
+        insOrderService.getIfsOrder(map,false);
         return Result.success();
     }
 
@@ -216,7 +215,7 @@
     public Result<?> delInsOrder(Integer insOrderId) {
         // 鏌ヨ璁㈠崟
         InsOrder order = insOrderService.getById(insOrderId);
-        if (!order.getState().equals(2)) {
+        if (!(order.getState().equals(2) || order.getState().equals(3))) {
             throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
         }
 
@@ -233,8 +232,7 @@
     @ApiOperation(value = "鏍规嵁璁㈠崟id鏌ヨ鏍峰搧")
     @GetMapping("/getSampleByOrderId")
     public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) {
-        return Result.success(insSampleService.list(Wrappers.<InsSample>lambdaQuery()
-                .eq(InsSample::getInsOrderId, insOrderId)));
+        return Result.success(insSampleService.getSampleByOrderId(insOrderId));
     }
 
     @ApiOperation(value = "鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�")
@@ -251,9 +249,25 @@
     }
 
     @ApiOperation(value = "鎴愬搧妫�楠屽崟鍏ㄩ儴淇℃伅瀵煎嚭")
-    @PostMapping("/rawAllInsOrderExport")
-    public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
+    @GetMapping("/rawAllInsOrderExport")
+    public void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response){
         insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
     }
 
+
+    @ApiOperation(value = "淇敼鏍峰搧鍨嬪彿")
+    @PostMapping("/updateSampleModel")
+    public Result<?> updateSampleModel(@RequestBody List<InsSample> insSampleList) {
+        for (InsSample insSample : insSampleList) {
+            insOrderService.updateSampleModel(insSample);
+        }
+        return Result.success();
+    }
+
+    @ApiOperation(value = "鏌ヨ褰撳墠鏃堕棿鏄惁娌℃湁璇ユ娴嬮」鐨勬娊鏍疯鍒�")
+    @PostMapping("/judgeNotSpotCheckOrder")
+    public Result<?> judgeNotSpotCheckOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+        return insOrderService.judgeNotSpotCheckOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder());
+    }
+
 }

--
Gitblit v1.9.3