#新增 1. 新增逻辑分区主子表

skyouc

2025-03-24 4eb5d44418c179f5ac087ce13311741ebad7e19b

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

@@ -62,11 +62,10 @@
        return R.ok().add(matnrService.listByIds(Arrays.asList(ids)));
    }


    @PreAuthorize("hasAuthority('manager:matnr:list')")
    @GetMapping("/matnr/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(matnrService.getById(id));
        return R.ok(matnrService.selectMatnrById(id));
    }

    @PreAuthorize("hasAuthority('manager:matnr:save')")
@@ -82,30 +81,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')")
@@ -125,6 +104,8 @@
            return R.error("Update Fail");
        }
        if (!FieldsUtils.getFieldsSta().isEmpty()) {
            Matnr matnr1 = matnrService.getById(matnr.getId());
            params.put("fieldsIndex", matnr1.getFieldsIndex());
            FieldsUtils.updateFieldsValue(params);
        }