From e04ce40a547fb63dc9c9f101902fad9952396f37 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 12 七月 2024 16:53:34 +0800
Subject: [PATCH] 检验项目的导入添加支持多个sheet与三级检测项目添加

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java |   59 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 63f1243..a321c6e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -1,6 +1,5 @@
 package com.yuanchu.mom.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,13 +14,13 @@
 import com.yuanchu.mom.service.InsOrderService;
 import com.yuanchu.mom.service.InsOrderTemplateService;
 import com.yuanchu.mom.service.InsProductService;
-import com.yuanchu.mom.service.InsSampleService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.context.annotation.Bean;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
@@ -32,7 +31,7 @@
 @RestController
 @AllArgsConstructor
 @RequestMapping("/insOrder")
-@Api("妫�楠屽崟妯″潡")
+@Api(tags="妫�楠屽崟妯″潡")
 public class InsOrderController {
 
     private InsOrderService insOrderService;
@@ -42,14 +41,22 @@
     private InsOrderTemplateService insOrderTemplateService;
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
-    @ValueAuth
-    @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
+    @ValueClassify("妫�楠屼笅鍗�")
+    @ApiOperation(value = "鏌ヨ鍗曚綅妫�楠屽崟")
     @PostMapping("/selectInsOrderParameter")
     public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
         Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
         SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
         return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
     }
+
+    @ValueClassify("妫�楠屼笅鍗�")
+    @ApiOperation(value = "鏌ョ湅鎵�鏈夋楠屽崟")
+    @PostMapping("/selectAllInsOrder")
+    public Result selectAllInsOrder(){
+        return Result.success();
+    }
+
     @ValueClassify("妫�楠屼笅鍗�")
     @ApiOperation(value = "妫�楠屽垎閰�")
     @PostMapping("/upInsOrder")
@@ -59,11 +66,13 @@
     @ValueClassify("妫�楠屼笅鍗�")
     @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
     @PostMapping("/addInsOrder")
-    public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
+    public Result<?> addInsOrder(String str) {
+        Map<String, Object> map = JSON.parseObject(str, Map.class);
         JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
         List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
         InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
-        return Result.success(insOrderService.addInsOrder(list, insOrder));
+        List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
+        return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
     }
 
     @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -71,7 +80,7 @@
     @ValueAuth
     public Result<?> selectOrderManDay(Integer id) {
         int day = insProductService.selectOrderManDay(id);
-        return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
     }
 
     @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@@ -125,7 +134,7 @@
         SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
         return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
     }
-    @ValueAuth
+    @ValueClassify("璐圭敤缁熻")
     @ApiOperation(value = "璐圭敤缁熻")
     @PostMapping("/costStatistics")
     public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
@@ -133,10 +142,32 @@
         CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
         return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
     }
-    @ValueAuth
+    @ValueClassify("缁熻鍥捐〃")
     @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
     @PostMapping("/selectSampleDefects")
     public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
         return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
     }
-}
+
+    @ValueClassify("妫�楠屼笅鍗�")
+    @ApiOperation(value = "鎾ら攢")
+    @PutMapping("/updateStatus")
+    public Result<?> updateStatus(Integer id) {
+        insOrderService.updateStatus(id);
+        return Result.success();
+    }
+
+    @PutMapping("/updateInspected")
+    @ValueAuth
+    public Result<?> updateInspected(Integer id){
+        insProductService.updateInspected(id);
+        return Result.success();
+    }
+
+    @ValueClassify("妫�楠屼笅鍗�")
+    @ApiOperation(value = "鏍囩鎵撳嵃")
+    @PostMapping("/labelPrinting")
+    public Result<?> labelPrinting(String ids) {
+        return Result.success(insOrderService.labelPrinting(ids));
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3