skyouc
2025-03-25 f967831b87cda525db4bf6f99c5caf3f2cbdef43
修改
#
1. 添加物料分组绑定接口
1个文件已添加
4个文件已修改
73 ■■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.service.MatnrService;
@@ -154,6 +155,21 @@
        return R.ok(new PageResult().setRecords(matnrPage.getRecords()).setTotal(matnrPage.getTotal()));
    }
    @PreAuthorize("hasAuthority('manager:matnr:list')")
    @ApiOperation("绑定物料分组")
    @PostMapping("/matnr/group/bind")
    public R bindMatnrToGroup(@RequestBody MatnrToGroupParams params) {
        if (Objects.isNull(params)) {
            throw new CoolException("参数不能为空!!");
        }
        if (matnrService.bindMatnrs(params)) {
            return R.ok();
        } else {
            return R.error("操作失败!!");
        }
    }
    @PreAuthorize("hasAuthority('manager:matnr:list')")
    @ApiOperation("导出物料信息")
    @PostMapping("/matnr/export")
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java
New file
@@ -0,0 +1,23 @@
package com.vincent.rsf.server.manager.controller.params;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List;
/**
 * 绑定物料分组请求参数
 */
@Data
@Accessors(chain = true)
public class MatnrToGroupParams implements Serializable {
    @ApiModelProperty("物料ID")
    private List<Long>  ids;
    @ApiModelProperty("分组ID")
    private Long groupId;
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
@@ -5,6 +5,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.Matnr;
import org.springframework.web.multipart.MultipartFile;
@@ -19,4 +20,6 @@
    PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam);
    Matnr selectMatnrById(Long id);
    boolean bindMatnrs(MatnrToGroupParams params);
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -6,6 +6,7 @@
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;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -14,6 +15,7 @@
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.mapper.MatnrMapper;
@@ -137,6 +139,32 @@
    }
    /**
     * 物料绑定
     * @param params
     * @return
     */
    @Override
    public boolean bindMatnrs(MatnrToGroupParams params) {
        if (Objects.isNull(params) && params.getIds().isEmpty()) {
            throw new CoolException("物料不能为空!!");
        }
        if (Objects.isNull(params.getGroupId())) {
            throw new CoolException("分组不能为空!!");
        }
        MatnrGroup groups = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getId, params.getGroupId()));
        if (Objects.isNull(groups)) {
            throw new CoolException("物料分组不存在!!");
        }
        if (!this.update(new LambdaUpdateWrapper<Matnr>()
                .in(Matnr::getId, params.getIds())
                .set(Matnr::getGroupId, groups.getId())
                .set(Matnr::getGroupCode, groups.getCode()))) {
            throw new CoolException("绑定失败!!");
        }
        return true;
    }
    /**
     * @desc 更新扩展物料扩展字段值
     * @param matnr
     * @return
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -64,7 +64,8 @@
    public R login(@RequestBody LoginParam param, HttpServletRequest request) {
        String username = param.getUsername();
        User user = userService.getByUsername(username
                , configProperties.getSystemMode().equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
                , configProperties.getSystemMode()
                        .equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
        );
        if (user == null) {
            return R.parse(BusinessRes.USERNAME_NOT_EXIST);