#修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复

skyouc

6 天以前 014270352f8e19b51bbb4367ae2ff256050a30a2

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

@@ -2,10 +2,9 @@

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.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
@@ -34,6 +33,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

@Service("matnrService")
public class MatnrServiceImpl extends ServiceImpl<MatnrMapper, Matnr> implements MatnrService {
@@ -86,10 +86,16 @@
            }
            //获取动态字段，并保存明细内容
            if (!FieldsUtils.getFieldsSta().isEmpty()) {
                String uuid = CommonUtil.randomUUID16();
                matnr.setFieldsIndex(uuid);
                //保存物料扩展属性值
                FieldsUtils.saveFields(template, uuid);
                try {
                    String uuid = CommonUtil.randomUUID16();
                    boolean b = FieldsUtils.saveFields(template, uuid);
                    if (b) {
                        matnr.setFieldsIndex(uuid);
                    }
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }
            }
            matnrs.add(matnr);
        });
@@ -101,19 +107,20 @@
    }

    @Override
    public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
        IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, pageParam.buildWrapper(true));
        /**获取物料分页信息 */
        List<Map<String, Object>> mapList = reulst.getRecords();
        if (!mapList.isEmpty()) {
            mapList.forEach(map -> {
                if (!Objects.isNull(map.get("fieldsIndex"))) {
                   FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
    public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
        QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
        if (params.containsKey("groupId")) {
            Object groupId = params.get("groupId");
            if (!Objects.isNull(groupId)) {
                List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString())).select(MatnrGroup::getId));
                if (!matnrGroups.isEmpty()) {
                    List<Long> longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
                    queryWrapper.or().in("group_id", longs);
                }
            });
            }
        }

        PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
        /**拼接扩展字段*/
        PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
        List<Matnr> records = page.getRecords();
        for (Matnr record : records) {
            if (!Objects.isNull(record.getFieldsIndex())) {
@@ -165,6 +172,45 @@
    }

    /**
     * 批量修改物料
     * @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;
    }

    @Override
    public PageParam<Matnr, BaseParam> getPages(Map<String, Object> map) {


        return null;
    }

    /**
     * @desc 更新扩展物料扩展字段值
     * @param matnr
     * @return
@@ -182,8 +228,14 @@
         */
        String uuid16 = CommonUtil.randomUUID16();
        if (!FieldsUtils.getFieldsSta().isEmpty()) {
            FieldsUtils.saveFields(matnr, uuid16);
            matnr1.setFieldsIndex(uuid16);
//            Map<String, ?> extendFields = (Map<String, ?>) matnr.get("extendFields");
            try {
                FieldsUtils.saveFields(matnr, uuid16);
                matnr1.setFieldsIndex(uuid16);
            } catch (Exception ex) {
                log.error(ex.toString());
                throw new CoolException("动态字段保存失败");
            }
        }
        if (!this.saveOrUpdate(matnr1)) {
            return R.error("Save Fail");