设备移植

zhuo

2025-02-20 3cfdf020e7f3c5fcef3a4b48e8532704b5b8b83b

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java

@@ -1,4 +1,4 @@
package com.ruoyi.basic.controller;
package com.ruoyi.inspect.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -75,16 +75,10 @@
        return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
    }

    //todo: 下单需要修改
    @ApiOperation(value = "添加检验下单数据")
    @PostMapping("/addInsOrder")
    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);
        List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
        return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
    public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
        return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
    }

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

    @Scheduled(fixedDelay = 1200000)
    public void getIfsOrderTiming() {
        insOrderService.getIfsOrder();
    }


    @ApiOperation(value = "修改订单单号")
    @PostMapping("/updateEntrustCode")
@@ -235,19 +224,6 @@
    public Result<?> getRetestResult(Integer insProductId) {
        return Result.success(insOrderService.getRetestResult(insProductId));
    }



    @ApiOperation(value = "铜单丝下单")
    @PostMapping("/addRawCopperOrder")
    public Result<?> addRawCopperOrder(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);
        CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class);
        return Result.success(insOrderService.addRawCopperOrder(list, CopperInsOrder));
    }


    @ApiOperation(value = "修改委托编号")
    @PostMapping("/updateOrderEntrustCode")
@@ -263,7 +239,7 @@
    }

    @ApiOperation(value = "删除退回订单")
    @GetMapping("/delInsOrder")
    @DeleteMapping("/delInsOrder")
    public Result<?> delInsOrder(Integer insOrderId) {
        // 查询订单
        InsOrder order = insOrderService.getById(insOrderId);