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

liyong

9 小时以前 1cf91e355038837f30f2d727507b2229263d7de7

 src/main/java/com/ruoyi/stock/controller/StockInRecordController.java

@@ -13,6 +13,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

@RestController
@@ -22,7 +23,7 @@
    @Autowired
    private StockInRecordService stockInRecordService;

    @GetMapping("/listPageByProduction")
    @GetMapping("/listPage")
    @Log(title = "生产入库-入库管理-列表", businessType = BusinessType.OTHER)
    @ApiOperation(value = "入库管理列表")
    public AjaxResult listPage(Page page, StockInRecordDto stockInRecordDto) {
@@ -30,17 +31,7 @@
        return AjaxResult.success(result);
    }

    @PostMapping("")
    @Log(title = "入库管理-新增入库", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody StockInRecordDto stockInRecordDto) {
        return AjaxResult.success(stockInRecordService.add(stockInRecordDto));
    }

    @PutMapping("/{id}")
    @Log(title = "入库管理-更新入库", businessType = BusinessType.UPDATE)
    public AjaxResult update(@PathVariable("id") Long id, @RequestBody StockInRecordDto stockInRecordDto) {
        return AjaxResult.success(stockInRecordService.update(id, stockInRecordDto));
    }

    @DeleteMapping("")
    @Log(title = "入库管理-删除入库", businessType = BusinessType.DELETE)
@@ -51,4 +42,10 @@
        return AjaxResult.success(stockInRecordService.batchDelete(ids));
    }

    @PostMapping("/exportStockInRecord")
    @ApiOperation("导出入库记录")
    public void exportStockInRecord(HttpServletResponse response, StockInRecordDto stockInRecordDto) {
        stockInRecordService.exportStockInRecord(response,stockInRecordDto);
    }

}