一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动...

zss

2025-03-28 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad

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

@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;

import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Warehouse;
import com.yuanchu.mom.pojo.WarehouseShelf;
import com.yuanchu.mom.service.WarehouseService;
@@ -15,23 +16,26 @@
@RequestMapping("/warehouse")
@RestController
@AllArgsConstructor
@Api("样品仓库")
@Api(tags = "样品管理")
public class WarehouseController {

    private WarehouseService warehouseService;

    @ValueClassify("样品管理")
    @PostMapping("/addWarehouse")
    @ApiOperation("添加仓库")
    public Result addWarehouse(String name) {
        return Result.success(warehouseService.addWarehouse(name));
    }

    @ValueClassify("样品管理")
    @GetMapping("/selectWarehouse")
    @ApiOperation("查询仓库")
    @ApiOperation("查询仓库---仅查询为空货架")
    public Result selectWarehouse() {
        return Result.success(warehouseService.selectWarehouse());
    }


    @ValueClassify("样品管理")
    @PostMapping("/addShelf")
    @ApiOperation("添加货架")
    @ApiImplicitParams({
@@ -43,25 +47,25 @@
    public Result addShelf(@RequestBody WarehouseShelf warehouseShelf) {
        return Result.success(warehouseService.addShelf(warehouseShelf));
    }

    @ValueClassify("样品管理")
    @PostMapping("/delWarehouse")
    @ApiOperation("删除仓库")
    public Result delWarehouse(Integer id) {
        return Result.success(warehouseService.delWarehouse(id));
    }

    @ValueClassify("样品管理")
    @PostMapping("/upWarehouse")
    @ApiOperation("修改仓库")
    public Result upWarehouse(@RequestBody Warehouse warehouse) {
        return Result.success(warehouseService.upWarehouse(warehouse));
    }

    @ValueClassify("样品管理")
    @PostMapping("/delShelf")
    @ApiOperation("删除货架")
    public Result delShelf(Integer id) {
        return Result.success(warehouseService.delShelf(id));
    }

    @ValueClassify("样品管理")
    @PostMapping("/upShelf")
    @ApiOperation("修改货架")
    public Result upShelf(@RequestBody WarehouseShelf warehouseShelf) {
@@ -71,32 +75,26 @@
    @GetMapping("/getWarehouse")
    @ApiOperation("查询货架下的存放信息")
    @ValueAuth
    public Result getWarehouse(Integer shelfId) {
        return Result.success(warehouseService.getWarehouse(shelfId));
    public Result getWarehouse(Integer shelfId,String sampleCode) {
        return Result.success(warehouseService.getWarehouse(shelfId,sampleCode));
    }

    @ValueClassify("样品管理")
    @PostMapping("/inWarehouse")
    @ApiOperation("样品入库")
    public Result inWarehouse(String trees, String sampleCode) {
        return Result.success(warehouseService.inWarehouse(trees, sampleCode));
    public Result inWarehouse(String trees, String sampleCode,String entrustCode) {
        return Result.success(warehouseService.inWarehouse(trees, sampleCode,entrustCode));
    }

    @ValueClassify("样品管理")
    @PostMapping("/outWarehouse")
    @ApiOperation("样品出库")
    public Result outWarehouse(String sampleCode) {
        return Result.success(warehouseService.outWarehouse(sampleCode));
    public Result outWarehouse(String sampleCode, boolean a,String entrustCode) {
        return Result.success(warehouseService.outWarehouse(sampleCode,a,entrustCode));
    }

    @ValueAuth
    @PostMapping("/getSampleRecord")
    @ApiOperation("查询样品详细记录")
    public Result getSampleRecord(Integer id) {
        return Result.success(warehouseService.getSampleRecord(id));
    }

    @PostMapping("/searchSampleId")
    @ApiOperation("通过样品编号进行检索")
    public Result searchSampleId(String sampleCode) {
        return Result.success(warehouseService.searchSampleId(sampleCode));
    }

}