Merge remote-tracking branch 'origin/master'

value

2024-05-30 29cadb9df9e289fc4dd45d17e577fe9695232ea4

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

@@ -31,7 +31,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
@Api("检验单模块")
@Api(tags="检验单模块")
public class InsOrderController {

    private InsOrderService insOrderService;
@@ -49,6 +49,14 @@
        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")
@@ -138,4 +146,19 @@
    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();
    }
    @ValueClassify("检验下单")
    @PutMapping("/updateInspected")
    @ValueAuth
    public Result<?> updateInspected(Integer id){
        insProductService.updateInspected(id);
        return Result.success();
    }
}