From 49cc211213ce71bd6e5bb8eeeffbda46c0bf98d8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 07 六月 2024 11:34:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 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 f5db78a..e3a1e03 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;
@@ -43,13 +42,21 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@ValueClassify("妫�楠屼笅鍗�")
- @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
+ @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 = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -110,10 +119,9 @@
public Result<?> selectInsOrderTemplateById(Integer id) {
return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
@PostMapping("/delInsOrderTemplate")
- @ValueAuth
public Result<?> delInsOrderTemplate(Integer id) {
return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
}
@@ -134,10 +142,25 @@
CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
}
- @ValueClassify("鏍峰搧缂洪櫡鎸囨暟")
- @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟", tags = "鏍峰搧缂洪櫡鎸囨暟")
+ @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();
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3