Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

yangyang

2025-03-21 8edc8701512d6a02492c8f8d38c05a4253650117

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

@@ -1,26 +1,32 @@
package com.vincent.rsf.server.manager.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
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.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -41,7 +47,7 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
        return R.ok().add(matnrService.page(pageParam, pageParam.buildWrapper(true)));
        return R.ok().add(matnrService.getMatnrPage(pageParam));
    }

    @PreAuthorize("hasAuthority('manager:matnr:list')")
@@ -56,6 +62,7 @@
        return R.ok().add(matnrService.listByIds(Arrays.asList(ids)));
    }


    @PreAuthorize("hasAuthority('manager:matnr:list')")
    @GetMapping("/matnr/{id}")
    public R get(@PathVariable("id") Long id) {
@@ -65,26 +72,42 @@
    @PreAuthorize("hasAuthority('manager:matnr:save')")
    @OperationLog("Create 物料信息表")
    @PostMapping("/matnr/save")
    public R save(@RequestBody Matnr matnr) {
        matnr.setCreateBy(getLoginUserId());
        matnr.setCreateTime(new Date());
        matnr.setUpdateBy(getLoginUserId());
        matnr.setUpdateTime(new Date());
        if (!matnrService.save(matnr)) {
            return R.error("Save Fail");
    public R save(@RequestBody Map<String, Object> matnr) {
        if (Objects.isNull(matnr)) {
            throw new CoolException("参数不能为空！！");
        }
        return R.ok("Save Success").add(matnr);
        if (Objects.isNull(matnr.get("name"))) {
            throw new CoolException("名称不能为空！！");
        }
        if (Objects.isNull(matnr.get("groupId"))) {
            throw new CoolException("物料分组不能为空！！");
        }
        matnr.put("createBy", getLoginUserId());
        matnr.put("updateBy", getLoginUserId());
        return matnrService.saveMatnrs(matnr);

    }

    @PreAuthorize("hasAuthority('manager:matnr:update')")
    @OperationLog("Update 物料信息表")
    @PostMapping("/matnr/update")
    public R update(@RequestBody Matnr matnr) {
    @Transactional(rollbackFor = Exception.class)
    public R update(@RequestBody Map<String, Object> params) {
        Matnr matnr = JSONObject.parseObject(JSONObject.toJSONString(params), Matnr.class);
        if (Objects.isNull(matnr.getCode())) {
            throw new CoolException("编码不能为空！！");
        }
        if (Objects.isNull(matnr.getName())) {
            throw new CoolException("名称不能为空！！");
        }
        matnr.setUpdateBy(getLoginUserId());
        matnr.setUpdateTime(new Date());
        if (!matnrService.updateById(matnr)) {
            return R.error("Update Fail");
        }
        if (!FieldsUtils.getFieldsSta().isEmpty()) {
            FieldsUtils.updateFieldsValue(params);
        }

        return R.ok("Update Success").add(matnr);
    }

@@ -140,7 +163,7 @@
        } else {
            matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
        }
        ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
        ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
    }

    @PreAuthorize("hasAuthority('manager:matnr:list')")