11

verou

2025-03-25 43721e95b3bb75e5a90a18120aaf12e0b632360a

11

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java

@@ -154,28 +154,11 @@
    @PostMapping("/matnr/group/bind")
    public R bindMatnrToGroup(@RequestBody MatnrToGroupParams params) {
        if (Objects.isNull(params)) {
            return  R.error("参数不能为空！！");
            throw new CoolException("参数不能为空！！");
        }
        if (matnrService.bindMatnrs(params)) {
            return R.ok();
        } else {
            return R.error("操作失败！！");
        }
    }

    @PreAuthorize("hasAuthority('manager:matnr:update')")
    @ApiOperation("批量修改")
    @PostMapping("/matnr/batch/update")
    public R batchUpdate(@RequestBody MatnrToGroupParams params) {
        if (Objects.isNull(params)) {
            return  R.error("参数不能为空！！");
        }
        if (Objects.isNull(params.getMatnr())) {
            return R.error("物料属性不能为空！！");
        }
        if (matnrService.batchUpdate(params)) {
            return R.ok();
        }else {
            return R.error("操作失败！！");
        }
    }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java

@@ -16,7 +16,6 @@
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,7 +24,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "仓库库区")
@RestController
public class WarehouseAreasController extends BaseController {


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java

@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.controller.params;

import com.vincent.rsf.server.manager.entity.Matnr;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -21,8 +20,4 @@

    @ApiModelProperty("分组ID")
    private Long groupId;

    @ApiModelProperty("物料属性")
    private Matnr matnr;

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java

@@ -22,6 +22,4 @@
    Matnr selectMatnrById(Long id);

    boolean bindMatnrs(MatnrToGroupParams params);

    boolean batchUpdate(MatnrToGroupParams params);
}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java

@@ -2,6 +2,8 @@

import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -159,38 +161,6 @@
                .set(Matnr::getGroupCode, groups.getCode()))) {
            throw new CoolException("绑定失败！！");
        }
        return true;
    }

    /**
     * 批量修改物料
     * @param params
     * @return
     */
    @Override
    public boolean batchUpdate(MatnrToGroupParams params) {
        if (Objects.isNull(params.getMatnr())) {
            throw new CoolException("物料属性不能为空！！");
        }
        if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
            throw new CoolException("所选物料不能为空！！");
        }
        Matnr matnr = params.getMatnr();
        if (!this.update(new LambdaUpdateWrapper<Matnr>().in(Matnr::getId, params.getIds())
                .set(!Objects.isNull(matnr.getStatus()), Matnr::getStatus, matnr.getStatus())
                .set(!Objects.isNull(matnr.getFlagCheck()), Matnr::getFlagCheck, matnr.getFlagCheck())
                .set(!Objects.isNull(matnr.getFlagLabelMange()), Matnr::getFlagLabelMange, matnr.getFlagLabelMange())
                .set(!Objects.isNull(matnr.getStockLevel()), Matnr::getStockLevel, matnr.getStockLevel())
                .set(!Objects.isNull(matnr.getShipperId()), Matnr::getShipperId, matnr.getShipperId())
                .set(!Objects.isNull(matnr.getMinQty()), Matnr::getMinQty, matnr.getMinQty())
                .set(!Objects.isNull(matnr.getMaxQty()), Matnr::getMaxQty, matnr.getMaxQty())
                .set(!Objects.isNull(matnr.getValid()), Matnr::getValid, matnr.getValid())
                .set(!Objects.isNull(matnr.getValidWarn()), Matnr::getValidWarn, matnr.getValidWarn())
                .set(!Objects.isNull(matnr.getStockUnit()), Matnr::getStockUnit, matnr.getStockUnit())
        )) {
            throw new CoolException("批量操作失败！！");
        }

        return true;
    }