fix(mes): 隔离设备物料并支持销售产品映射

liu

3 天以前 381e02b9eccbe953b31d09f2af1c2ce77c816140

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java

@@ -9,6 +9,9 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmStockImportExcelVO;
import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmStockImportService;
import org.springframework.web.multipart.MultipartFile;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockMoveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
@@ -71,10 +74,27 @@
    @Resource
    private SrmSupplierApi srmSupplierApi;

    @Resource
    private MesWmStockImportService stockImportService;

    @GetMapping("/get-import-template")
    @Operation(summary = "下载库存导入模板")
    @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:adjust')")
    public void importTemplate(HttpServletResponse response) throws IOException {
        ExcelUtils.writeTemplate(response, "库存导入模板.xls", "库存明细", MesWmStockImportExcelVO.class, Collections.emptyList());
    }

    @PostMapping("/import")
    @Operation(summary = "导入库存增量")
    @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:adjust')")
    public CommonResult<Map<String, Object>> importStock(@RequestParam("file") MultipartFile file,
            @RequestParam(value = "updateSupport", defaultValue = "false") boolean updateSupport) throws IOException {
        if (updateSupport) throw new IllegalArgumentException("库存导入仅支持累加入库，不支持覆盖");
        return success(stockImportService.importRows(ExcelUtils.read(file, MesWmStockImportExcelVO.class)));
    }
    @GetMapping("/get")
    @Operation(summary = "获得库存记录")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:query')")
    public CommonResult<MesWmMaterialStockRespVO> getMaterialStock(@RequestParam("id") Long id) {
        MesWmMaterialStockDO stock = materialStockService.getMaterialStock(id);
        if (stock == null) {
@@ -85,7 +105,6 @@

    @GetMapping("/page")
    @Operation(summary = "获得库存台账分页")
    @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:query')")
    public CommonResult<PageResult<MesWmMaterialStockRespVO>> getMaterialStockPage(
            @Valid MesWmMaterialStockPageReqVO pageReqVO) {
        PageResult<MesWmMaterialStockDO> pageResult = materialStockService.getMaterialStockPage(pageReqVO);