#修改 1. 逻辑分区绑定 2. 物料代码优化

yangyang

2025-03-21 4cc644945bda98e1ec30828944796ce2fb96e698

#修改
1. 逻辑分区绑定
2. 物料代码优化

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

@@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "逻辑分区")
@RestController
public class LocAreaController extends BaseController {


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

@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.LocAreaRela;
import com.vincent.rsf.server.manager.service.LocAreaRelaService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;


@Api(tags = "逻辑分区")
@RestController
public class LocAreaRelaController extends BaseController {


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

@@ -82,30 +82,10 @@
        if (Objects.isNull(matnr.get("groupId"))) {
            throw new CoolException("物料分组不能为空！！");
        }
        matnr.put("createBy", getLoginUserId());
        matnr.put("updateBy", getLoginUserId());
        return matnrService.saveMatnrs(matnr);

        Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
        if (Objects.isNull(matnr1.getCode())) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
            System.out.println("=========>");
            System.out.println(ruleCode);
            matnr1.setCode(ruleCode);
        }
        /**
         * 扩展字段存入库
         */
        String uuid16 = CommonUtil.randomUUID16();
        if (!FieldsUtils.getFieldsSta().isEmpty()) {
            FieldsUtils.saveFields(matnr, uuid16);
            matnr1.setFieldsIndex(uuid16);
        }

        matnr1.setCreateBy(getLoginUserId());
        matnr1.setUpdateBy(getLoginUserId());

        if (!matnrService.save(matnr1)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(matnr);
    }

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

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

@@ -7,9 +7,13 @@
import com.vincent.rsf.server.manager.entity.Matnr;
import org.springframework.web.multipart.MultipartFile;

import java.util.Map;

public interface MatnrService extends IService<Matnr> {

    R importExcels(MultipartFile file) throws Exception;

    PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam);

    R saveMatnrs(Map<String, Object> matnr);
}

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

@@ -2,6 +2,7 @@

import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.common.SpringUtils;
@@ -18,8 +19,10 @@
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -108,4 +111,33 @@
        page.setRecords(records);
        return page;
    }

    /**
     * @desc 更新扩展物料扩展字段值
     * @param matnr
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveMatnrs(Map<String, Object> matnr) {
        Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
        if (Objects.isNull(matnr1.getCode())) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
            System.out.println("=========>");
            System.out.println(ruleCode);
            matnr1.setCode(ruleCode);
        }
        /**
         * 扩展字段存入库
         */
        String uuid16 = CommonUtil.randomUUID16();
        if (!FieldsUtils.getFieldsSta().isEmpty()) {
            FieldsUtils.saveFields(matnr, uuid16);
            matnr1.setFieldsIndex(uuid16);
        }
        if (!this.save(matnr1)) {
            return R.error("Save Fail");
        }
        return R.ok("保存成功!!");
    }
}