feat(inspect): 完善检验订单状态管理和样品接收流程

liding

7 小时以前 51786b723d0a91d11476776d9ce50af7994dc4bd

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

@@ -53,7 +53,7 @@
    //获取检验下单数据
    @ApiOperation(value = "查询单位检验单")
    @GetMapping("/selectInsOrderParameter")
    public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) throws Exception {
    public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) {
        return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
    }

@@ -75,13 +75,16 @@
    @ApiOperation(value = "检验分配")
    @PostMapping("/upInsOrder")
    public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
        return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
        return Result.fail("请在样品接收页面选择主检验人后提交检验");
    }

    @ApiOperation(value = "添加检验下单数据")
    @PreAuthorize("@ss.hasPermi('add:insOrder')")
    @PostMapping("/addInsOrder")
    public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
        if (insPlaceOrderDto.getStandardTreeId() != null) {
            return Result.success(insOrderService.addNewJuInsOrder(insPlaceOrderDto));
        }
        return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
    }