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

verou

2025-03-26 669072c5f71421f937cd46a1cc8f4b838953e895

 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.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 +13,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;
@@ -87,7 +87,11 @@
                String uuid = CommonUtil.randomUUID16();
                matnr.setFieldsIndex(uuid);
                //保存物料扩展属性值
                FieldsUtils.saveFields(template, uuid);
                try {
                    FieldsUtils.saveFields(template, uuid);
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }
            }
            matnrs.add(matnr);
        });
@@ -137,6 +141,64 @@
    }

    /**
     * 物料绑定
     * @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;
    }

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

    /**
     * @desc 更新扩展物料扩展字段值
     * @param matnr
     * @return
@@ -154,8 +216,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(extendFields, uuid16);
                matnr1.setFieldsIndex(uuid16);
            } catch (Exception ex) {
                log.error(ex.toString());
                throw new CoolException("动态字段保存失败");
            }
        }
        if (!this.saveOrUpdate(matnr1)) {
            return R.error("Save Fail");