Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2 天以前 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2

 src/main/java/com/ruoyi/production/controller/ProductionOrderPickController.java

@@ -1,7 +1,15 @@
package com.ruoyi.production.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionOrderPickDto;
import com.ruoyi.production.bean.vo.ProductionOrderPickVo;
import com.ruoyi.production.service.ProductionOrderPickService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -13,6 +21,28 @@
 */
@RestController
@RequestMapping("/productionOrderPick")
@Tag(name = "生产订单领料")
@RequiredArgsConstructor
public class ProductionOrderPickController {

    private final ProductionOrderPickService productionOrderPickService;

    @PostMapping("/savePick")
    @Operation(summary = "领料保存到线边仓")
    public R<Boolean> savePick(@RequestBody ProductionOrderPickDto dto) {
        return R.ok(productionOrderPickService.savePick(dto));
    }

    @PostMapping("/updatePick")
    @Operation(summary = "变更领料")
    public R<Boolean> updatePick(@RequestBody ProductionOrderPickDto dto) {
        return R.ok(productionOrderPickService.updatePick(dto));
    }

    @GetMapping("/detail/{productionOrderId}")
    @Operation(summary = "查询已领料详情")
    public R<List<ProductionOrderPickVo>> listPickedDetail(@PathVariable Long productionOrderId) {
        return R.ok(productionOrderPickService.listPickedDetail(productionOrderId));
    }
}