From e24852ee175fc8c1ccc0dbb080caa18793f0070e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 07 六月 2024 02:54:29 +0800
Subject: [PATCH] 实现“熔接损耗项目”
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 177 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 135 insertions(+), 42 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 1cc8262..5e98366 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,72 +1,165 @@
package com.yuanchu.mom.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.InsOderDto;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.CostStatisticsDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
+import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.pojo.InsOrder;
-import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.pojo.InsOrderTemplate;
import com.yuanchu.mom.service.InsOrderService;
-import com.yuanchu.mom.service.InsSampleService;
+import com.yuanchu.mom.service.InsOrderTemplateService;
+import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
+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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
import java.util.Map;
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
+@Api(tags="妫�楠屽崟妯″潡")
public class InsOrderController {
private InsOrderService insOrderService;
- private InsSampleService insSampleService;
+ private InsProductService insProductService;
+
+ private InsOrderTemplateService insOrderTemplateService;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
- @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);
- InsOrder itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrder.class);
- return Result.success(insOrderService.selectInsOrderParameter(page, itemParameter));
+ 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")
+ public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
+ return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
+ }
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
- @PostMapping("/addInsOrderParameter")
- public Result addInsOrderParameter(@RequestBody InsOrder itemParameter) {
- return Result.success(insOrderService.addInsOrderParameter(itemParameter));
- }
-
- @ApiOperation(value = "鍒犻櫎妫�楠屼笅鍗曟暟鎹�")
- @PostMapping("/delInsOrderParameter")
- public Result<?> delInsOrderParameter(Integer id) {
- return Result.success(insOrderService.delInsOrderParameter(id));
- }
-
- @ApiOperation(value = "淇敼妫�楠屼笅鍗曟暟鎹�")
- @PostMapping("/upInsOrderParameter")
- public Result<?> upInsOrderParameter(@RequestBody InsOrder itemParameter) {
- return Result.success(insOrderService.upInsOrderParameter(itemParameter));
- }
-
- @ApiOperation(value = "淇敼妫�楠屼笅鍙戞暟鎹�")
- @PostMapping("/updateInsOrder")
- public Result updateInsOrder(@RequestBody InsOderDto insOderDto) {
- InsSample insSample = new InsSample();
- insSample.setId(insOderDto.getId());
- insSample.setCreateTime(insOderDto.getDate());
- insSample.setCreateUser(insOderDto.getOrderName());
- return Result.success(insSampleService.updateById(insSample));
- }
-
- @ApiOperation(value = "鏂板妫�楠屼笅鍙戞暟鎹�")
@PostMapping("/addInsOrder")
- public Result addInsOrder(@RequestBody InsSample insSample) {
- return Result.success(insSampleService.save(insSample));
+ public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
+ 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);
+ List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
+ return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
}
-}
+ @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
+ @PostMapping("/selectOrderManDay")
+ @ValueAuth
+ public Result<?> selectOrderManDay(Integer id) {
+ int day = insProductService.selectOrderManDay(id);
+ return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
+ @PostMapping("/getInsOrder")
+ @ValueAuth
+ public Result<?> getInsOrder(Integer orderId) {
+ return Result.success(insOrderService.getInsOrder(orderId));
+ }
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
+ })
+ @PostMapping("/upInsOrderOfState")
+ public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
+ return Result.success(insOrderService.upInsOrderOfState(insOrder));
+ }
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
+ @PostMapping("/addInsOrderTemplate")
+ public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
+ return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屽崟妯℃澘")
+ @GetMapping("/selectInsOrderTemplate")
+ @ValueAuth
+ public Result<?> selectInsOrderTemplate() {
+ return Result.success(insOrderTemplateService.selectInsOrderTemplate());
+ }
+
+ @ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
+ @PostMapping("/selectInsOrderTemplateById")
+ @ValueAuth
+ public Result<?> selectInsOrderTemplateById(Integer id) {
+ return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
+ }
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
+ @PostMapping("/delInsOrderTemplate")
+ public Result<?> delInsOrderTemplate(Integer id) {
+ return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
+ }
+
+ @ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
+ @PostMapping("/selectSampleAndProductByOrderId")
+ @ValueAuth
+ public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
+ return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
+ }
+ @ValueClassify("璐圭敤缁熻")
+ @ApiOperation(value = "璐圭敤缁熻")
+ @PostMapping("/costStatistics")
+ public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+ return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
+ }
+ @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