检验下单新增附件,时间,电机编号

zss

2024-09-29 afebb0ff6b79092519377d943462cc084b9cdb28

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java

@@ -5,13 +5,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.dto.*;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsOrderTemplate;
import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.InsOrderTemplateService;
import com.yuanchu.mom.service.InsProductService;
@@ -23,6 +21,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
@@ -72,13 +71,13 @@
    @ValueClassify("检验下单")
    @ApiOperation(value = "添加检验下单数据")
    @PostMapping("/addInsOrder")
    public Result<?> addInsOrder(String str) {
    public Result<?> addInsOrder(@RequestParam String str, @RequestParam List<MultipartFile> files) {
        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);
        List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
        return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
        return Result.success(insOrderService.addInsOrder(list, insOrder, pairing,files));
    }

    @ApiOperation(value = "查询订单最长预计时间")
@@ -218,6 +217,20 @@
        return Result.success(insOrderService.labelPrinting(ids));
    }

    @ValueAuth
    @ApiOperation(value = "校验电机编号")
    @PostMapping("/checkNumber")
    public Result<?> checkNumber(String ids) {
        return Result.success(insOrderService.checkNumber(ids));
    }

    @ValueAuth
    @ApiOperation(value = "填写电机编号")
    @PostMapping("/addNumber")
    public Result<?> addNumber(@RequestBody List<InsSample> insSamples) {
        return Result.success(insOrderService.addNumber(insSamples));
    }

    @ValueClassify("费用统计")
    @ApiOperation(value = "费用统计导出")
    @PostMapping("/export")