Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

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

@@ -1,18 +1,19 @@
package com.mes.rawglassdetails.controller;


import com.mes.entity.request.GeneralRequest;
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.userinfo.entity.vo.SysUserVO;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 * 前端控制器
 * </p>
 *
 * @author wf
 * @since 2024-09-10
@@ -21,27 +22,28 @@
@RequestMapping("/rawGlassStorageDetails")
public class RawGlassStorageDetailsController {

    @Autowired
    private RawGlassStorageDetailsService rawGlassStorageDetailsService;
    @ApiOperation("工位状态")
    @PostMapping("/updateEnableState")
    @ResponseBody
    public Result<Boolean> updateStatus(@RequestBody Integer enableState) {
        boolean result = rawGlassStorageDetailsService.updateRawGlassStorageDetails(String.valueOf(enableState));
        if (enableState == 1) {
            return Result.build(1, "启用", result);
        } else {
            return Result.build(0, "禁用", result);
        }
    }
  @Autowired private RawGlassStorageDetailsService rawGlassStorageDetailsService;

    @ApiOperation("原片入库")
    @PostMapping("/patternWarehousing")
    public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest 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));
  }

        return Result.build(200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.patternWarehousing(request));

    }

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