Merge remote-tracking branch 'origin/master'

zhoushihao

2025-05-12 fbd31387721424c65b173cbb23b03202f3e7dce6

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java

@@ -1,5 +1,6 @@
package com.mes.rawglassdetails.controller;

import com.mes.rawglassdetails.entity.dto.RawGlassStorageDetailsDTO;
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.utils.Result;
@@ -11,6 +12,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * 前端控制器
 *
@@ -21,51 +24,60 @@
@RequestMapping("/rawGlassStorageDetails")
public class RawGlassStorageDetailsController {

  @Autowired
  private RawGlassStorageDetailsService rawGlassStorageDetailsService;
    @Autowired
    private RawGlassStorageDetailsService rawGlassStorageDetailsService;

  @ApiOperation("入库请求")
  @PostMapping("/warehousingRequest")
  public Result<String> warehousingRequest(int leftingStation) {
    return Result.build(
            200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.warehousingRequest(leftingStation));
  }
    @ApiOperation("入库请求")
    @PostMapping("/warehousingRequest")
    public Result<String> warehousingRequest(int leftingStation) {
        return Result.build(
                200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.warehousingRequest(leftingStation));
    }

  @ApiOperation("原片入库")
  @PostMapping("/patternWarehousing")
  public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
    return Result.build(
            200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.patternWarehousing(request));
  }
    @ApiOperation("原片入库")
    @PostMapping("/patternWarehousing")
    public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
        return Result.build(
                200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.patternWarehousing(request));
    }

  @ApiOperation("更新剩余数量")
  @PostMapping("/updateQuantity")
  public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
    return Result.success(rawGlassStorageDetailsService.UpdateQuantity(request));
  }
  @ApiOperation("删除原片")
  @PostMapping("/deleteWarehousing")
  public Result<Object> deleteWarehousing(@RequestBody Long slotId) {
    return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slotId));
  }
    @ApiOperation("更新剩余数量")
    @PostMapping("/updateQuantity")
    public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
        return Result.success(rawGlassStorageDetailsService.updateQuantity(request));
    }

  @ApiOperation("原片出库")
  @PostMapping("/outWarehousing")
  public Result<Object> outWarehousing(@RequestBody Long slotId) {
    return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
  }
    @ApiOperation("删除原片")
    @PostMapping("/deleteWarehousing")
    public Result<Object> deleteWarehousing(Long slot) {
        return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slot));
    }

    @ApiOperation("原片出库")
    @PostMapping("/outWarehousing")
    public Result<Object> outWarehousing(Long slotId) {
        return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
    }


  @ApiOperation("出库请求")
  @PostMapping("/outWarehousingRequest")
  public Result<String> outWarehousingRequest(int leftingStation) {
    return Result.build(
            200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.outWarehousingRequest(leftingStation));
  }
    @ApiOperation("出库请求")
    @PostMapping("/outWarehousingRequest")
    public Result<String> outWarehousingRequest(int leftingStation) {
        return Result.build(
                200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.outWarehousingRequest(leftingStation));
    }

  @ApiOperation("架子复位")
  @PostMapping("/shelfReset")
  public Result<String> shelfReset(Long slot) {
    return Result.success(rawGlassStorageDetailsService.shelfReset(slot));
  }
    @ApiOperation("架子复位")
    @PostMapping("/shelfReset")
    public Result<String> shelfReset(Long slot) {
        return Result.success(rawGlassStorageDetailsService.shelfReset(slot));
    }

    @ApiOperation("原片使用情况")
    @PostMapping("/patternUsage")
    public Result<List<RawGlassStorageDetailsDTO>> patternUsage(String width, String height, String thickness, String films) {
        return Result.build(200, "查询成功", rawGlassStorageDetailsService.patternUsage(width, height, thickness, films));
    }


}